merge of '05ad3485b42ecb00f88755641322f85ba7842784'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 5 Mar 2008 17:12:38 +0000 (17:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 5 Mar 2008 17:12:38 +0000 (17:12 +0000)
     and 'db7e324079b29569e9e6a52a22576a281140b12a'


Trivial merge