merge of 4c2bff0a75bafec17f894f5e677f4b07f8d120c8
authorMichael Lauer <mickey@vanille-media.de>
Fri, 28 Jul 2006 11:44:26 +0000 (11:44 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 28 Jul 2006 11:44:26 +0000 (11:44 +0000)
     and c77cc66707f3afa1dbccc1b73d6de5cfc836058e


Trivial merge