merge of '0ad423d3482b73008fa7b39e78b0dbc3658cbc50'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 28 Jul 2008 22:01:56 +0000 (22:01 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 28 Jul 2008 22:01:56 +0000 (22:01 +0000)
     and 'a9043ecc52370e4ecf1fd689e40cf12dac122cb9'


Trivial merge