merge of '32c3532162bccf620b7b8cff0f98f92a1f519b3a'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 21 Feb 2008 11:54:07 +0000 (11:54 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 21 Feb 2008 11:54:07 +0000 (11:54 +0000)
     and '572f8a9e138fdfcf2db206180ca705b00b696a64'


Trivial merge