merge of 31d357b0ebed18d4bed9207bdfd1217f9cf35e9a
authorMichael Lauer <mickey@vanille-media.de>
Thu, 3 Aug 2006 17:16:17 +0000 (17:16 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 3 Aug 2006 17:16:17 +0000 (17:16 +0000)
     and eb2bcd61169a0e93f50d3ebb9812a73ae81ac06c


Trivial merge