merge of a3eaa78e93ce09edb93d710e411a9ec816ded220
authorMichael Lauer <mickey@vanille-media.de>
Thu, 27 Jul 2006 19:22:12 +0000 (19:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 27 Jul 2006 19:22:12 +0000 (19:22 +0000)
     and ae27401cf5a29bfa7682b7fe0568b2bbe7d5be08


Trivial merge