merge of 'b9249f27ed481c5d02d4b0a68b50c1e6688fe484'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 4 Sep 2008 11:12:29 +0000 (11:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 4 Sep 2008 11:12:29 +0000 (11:12 +0000)
     and 'c8025b1589420ff484c99ad1c0e06906ad36b85d'


Trivial merge