merge of 7d7323376ea7f6cae9fe0cdfb367a78cab4dd545
authorMichael Lauer <mickey@vanille-media.de>
Mon, 7 Aug 2006 20:44:53 +0000 (20:44 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 7 Aug 2006 20:44:53 +0000 (20:44 +0000)
     and b54bb5e5747d757772498c2e3c720f407fdcf023


Trivial merge