merge of 'b74bbaef312bef5b91193f9733ecea39b3427e18'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 25 Aug 2008 19:44:33 +0000 (19:44 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 25 Aug 2008 19:44:33 +0000 (19:44 +0000)
     and 'd800abb6a82b493cb7014046a6c4a2db09d3b5e4'


Trivial merge