merge of '5210c083ec8a6cdc5a8ab04ea377114cbb2938b3'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 28 Feb 2008 12:01:56 +0000 (12:01 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 28 Feb 2008 12:01:56 +0000 (12:01 +0000)
     and 'e657326eb8ba936ca64ffbedee6d6415a1ac4ac5'


Trivial merge