merge of '966f676702aa63ef60cf920469fe2209089901c4'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 8 Feb 2008 14:53:04 +0000 (14:53 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 8 Feb 2008 14:53:04 +0000 (14:53 +0000)
     and 'c22e6cdc0081f060e54d4e152ce8e2adb2546893'


Trivial merge