merge of '8757cea2a30d383fc8b9e31dc7ae714a4df33a64'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 3 Sep 2008 19:22:53 +0000 (19:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 3 Sep 2008 19:22:53 +0000 (19:22 +0000)
     and 'ca29e1912671c0d9322d55bfb15de7d18a7379d6'


Trivial merge