merge of '878f6895b40f34c695cfef0d475e299f1a2d8eda'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 4 Oct 2008 16:12:10 +0000 (16:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 4 Oct 2008 16:12:10 +0000 (16:12 +0000)
     and 'a6240987d2107aef28e1c5419eb7da825ff812f5'


Trivial merge