merge of '1a9562c7bb5c319cf92b8df367011b69cd07992b'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 1 Aug 2007 22:06:57 +0000 (22:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 1 Aug 2007 22:06:57 +0000 (22:06 +0000)
     and '2d281351e8579e348717227c6b84f55ef13fd0ff'


Trivial merge