merge of 963bef78cb5cce1bc02dc3d20926c05ed5a0829e
authorMichael Lauer <mickey@vanille-media.de>
Thu, 10 Aug 2006 12:21:05 +0000 (12:21 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 10 Aug 2006 12:21:05 +0000 (12:21 +0000)
     and d0d679b8dd75fda2d9302444ab3ff913e495d02f


Trivial merge