merge of '066c6fcbe98c8444c2fbff69204d0d8606d85077'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 31 Jul 2008 16:10:25 +0000 (16:10 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 31 Jul 2008 16:10:25 +0000 (16:10 +0000)
commit7434bf1165e8b691aca98d441508b5c9b14602cd
treef5e4bbc9893fff6d3d9a4946ba7e8015b6549b48
parentea00464153e0ae794b5f3ae1fb1ca29585287495
parentcff6460ee26400d468a56868e7450403b72e6233
Merge ... '066c6fcbe98c8444c2fbff69204d0d8606d85077'
     and 'db68486a1e4128249ae5f54b7ac2b1278ba29b53'