merge of '2a44f6283ca97f8f5d3a7e5075008a46aaf531fb'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 16 Aug 2007 13:44:42 +0000 (13:44 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 16 Aug 2007 13:44:42 +0000 (13:44 +0000)
     and '52d9ae7d2594e31289d20d8dbe1bb58be3c26a82'


Trivial merge