merge of '1d903fb7ec58f7624d299d4ab97b686792281fab'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 8 Mar 2008 17:59:41 +0000 (17:59 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 8 Mar 2008 17:59:41 +0000 (17:59 +0000)
     and 'e32ef2d91c28ac53b3bb5ea6cc70a9ed3182abb5'


Trivial merge