merge of '61be15dc709dfd7e90a6b6b0dae645794cdea4ef'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 24 Sep 2008 08:20:09 +0000 (08:20 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 24 Sep 2008 08:20:09 +0000 (08:20 +0000)
     and 'c8d8749d5997b7808c2e25161edaa4c4759f3838'


Trivial merge