merge of 'e2f4456d565b95939ea1c515808e7c16c52b591a'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 27 Feb 2008 13:41:43 +0000 (13:41 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 27 Feb 2008 13:41:43 +0000 (13:41 +0000)
     and 'eefe1e616b9d0ad9b002797464d94b99b92213fb'


Trivial merge