merge of '87e3cc07eb2fd42d7850e6b0c1f67268404695d0'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jul 2008 12:00:15 +0000 (12:00 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jul 2008 12:00:15 +0000 (12:00 +0000)
     and 'f572f61df65c44a6ea6b9b987560f1edd3171a1b'


Trivial merge