merge of '02a02b10517e99b436e2b65592aa837804903373'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 13 Aug 2008 15:48:29 +0000 (15:48 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 13 Aug 2008 15:48:29 +0000 (15:48 +0000)
     and '03fd68a93fd9cdf820919cce44a380cbf9b9e9b5'


Trivial merge