merge of 1a66dacb1592037ea25fd0a5aab56279ccdc2472
authorMichael Lauer <mickey@vanille-media.de>
Thu, 3 Aug 2006 17:22:56 +0000 (17:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 3 Aug 2006 17:22:56 +0000 (17:22 +0000)
     and 3c7a41a2de382cc83b03dee39ff407017f1f13d8


Trivial merge