merge of b3e86370942ae81e42661d50c1440b905d9b3b5b
authorMichael Lauer <mickey@vanille-media.de>
Thu, 3 Aug 2006 18:31:31 +0000 (18:31 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 3 Aug 2006 18:31:31 +0000 (18:31 +0000)
     and f14e35813d5a67a7c6363eebc51916ea9c57c668


Trivial merge