merge of '08f4abe0b59e692c9044f0c59f6e046959c301f2'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 9 Aug 2007 19:03:40 +0000 (19:03 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 9 Aug 2007 19:03:40 +0000 (19:03 +0000)
     and '4ed4d79390a6068104e811416de62ad3af9b3949'


Trivial merge