merge of '23febe44719cb1ea7557c584ce7c762da82df4d5'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 15 May 2008 18:12:20 +0000 (18:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 15 May 2008 18:12:20 +0000 (18:12 +0000)
     and '5fdefb8b4b08bb2ea1670328ae0c67e3d5335805'


Trivial merge