merge of 8eaefa4f638dc67e29fb59fca3c6a98e4049eb09
authorMichael Lauer <mickey@vanille-media.de>
Sun, 24 Dec 2006 17:40:06 +0000 (17:40 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 24 Dec 2006 17:40:06 +0000 (17:40 +0000)
     and f6f04acc928b89f8740f4f2ef14b479a36781bc5


Trivial merge