merge of 2694ea866aead6f6639b0c69c13127c90f95e5ff
authorMichael Lauer <mickey@vanille-media.de>
Wed, 23 Aug 2006 19:22:52 +0000 (19:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 23 Aug 2006 19:22:52 +0000 (19:22 +0000)
     and c02b3cdfadfa7f433fd5ca7a0ffcb6f329cadbaf


Trivial merge