merge of 'aeb1ac8ac964032ee256054d8009fd226a984570'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 26 Jul 2008 15:58:45 +0000 (15:58 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 26 Jul 2008 15:58:45 +0000 (15:58 +0000)
     and 'b86db14f5edd4f268d21ba089697b479d09548ce'


Trivial merge