merge of '1adf7728881d50d6f0c0d604d00e706cf049e597'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 22 Aug 2007 13:48:16 +0000 (13:48 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 22 Aug 2007 13:48:16 +0000 (13:48 +0000)
     and 'c3529caf8553e1815756aba75bbc52d0f342e609'


Trivial merge