merge of 2e20cd2e17b7f73e026db0536fb11075bff0eaf9
authorMichael Lauer <mickey@vanille-media.de>
Wed, 30 Aug 2006 14:15:16 +0000 (14:15 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 30 Aug 2006 14:15:16 +0000 (14:15 +0000)
     and 9a707a5097109b9a1f2ce8a8f2945ef2d611a1d6


Trivial merge