merge of '3d608e2b9463b14c4a0a12230196b70080b1513d'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 10 Mar 2008 10:18:53 +0000 (10:18 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 10 Mar 2008 10:18:53 +0000 (10:18 +0000)
commit42565b03e846f7ae4e153bd6ffe9cb702daaf926
tree4d533b24b1c28acdfdf4bc52d1b79db89024eaad
parent03ebacf98db248bac9b68d83680027acd2a4a023
parent587f9f658071292d11491ef26cb2d81f0e3c9e42
Merge ... '3d608e2b9463b14c4a0a12230196b70080b1513d'
     and 'c8a04b4c21aa3cccc256c033dc9532d6dc88be53'