merge of '5190e4eb0827b8bfe3f72475ad62fd98585e8bfa'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 23 Aug 2007 12:23:06 +0000 (12:23 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 23 Aug 2007 12:23:06 +0000 (12:23 +0000)
     and 'e30e879439bfeb0f5e33edf2a3e8bfa1828eed4f'


Trivial merge