merge of '559b63acfed0420f839e535ffad26766df66437a'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 8 Apr 2008 12:07:43 +0000 (12:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 8 Apr 2008 12:07:43 +0000 (12:07 +0000)
     and 'c8122b4f0e7a0350bf0208abe44a4d7fd4c8828b'


Trivial merge