merge of '0b19325615fce6910697ae5a99185b4d99f10436'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 24 Sep 2008 08:30:58 +0000 (08:30 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 24 Sep 2008 08:30:58 +0000 (08:30 +0000)
     and 'cce0978f34bb80458a90186b20dadfd46ccfb0b1'


Trivial merge