merge of '7c9631167173e3ba316bc3efd67dece0804859a7'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 18 Aug 2007 13:14:22 +0000 (13:14 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 18 Aug 2007 13:14:22 +0000 (13:14 +0000)
     and '8ae2f68097943e0d2ab4479bb2e0e0a568de60fd'


Trivial merge