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)
     and 'c8a04b4c21aa3cccc256c033dc9532d6dc88be53'


Trivial merge