merge of '4691fac16318391e3125e1a88e96b9003fa1c4f0'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 14 Nov 2007 10:56:02 +0000 (10:56 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 14 Nov 2007 10:56:02 +0000 (10:56 +0000)
     and '9934077f8cc45499fe70c414041ee257c6f7b98d'


Trivial merge