merge of '9d982d512a4fe1be6d4da15efa2564ac9b14bb0d'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 16 Jan 2008 23:03:32 +0000 (23:03 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 16 Jan 2008 23:03:32 +0000 (23:03 +0000)
     and 'b5107429ca97b2f516633a57175b0dc5846df507'


Trivial merge