merge of '3f1372952a23092858708c96a555777c98913155'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 16 Feb 2008 19:54:11 +0000 (19:54 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 16 Feb 2008 19:54:11 +0000 (19:54 +0000)
     and '5c877070afbb7851bfc57f33ee001f333b29c5c2'


Trivial merge