merge of '2a03e34bdcc2e0c0f1a0fc21e23f3410bf721570'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 15 Aug 2007 12:33:13 +0000 (12:33 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 15 Aug 2007 12:33:13 +0000 (12:33 +0000)
     and 'c7f491129542b0c8e72a670a0ce2395920494179'


Trivial merge