merge of '0460728e4ca997f4b4f35b944f412c51046ff418'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 16 Jan 2008 12:52:08 +0000 (12:52 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 16 Jan 2008 12:52:08 +0000 (12:52 +0000)
     and '1b0acc215822890043b4d815ac222a6c2e77a15b'


Trivial merge