merge of '409a4420e74feeb71713c8fa1d853dfa021daf3f'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 13:05:11 +0000 (13:05 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 13:05:11 +0000 (13:05 +0000)
     and '538e4bfaca216445bb346ce8d4d110161a06c902'


Trivial merge