merge of '4f7ef143d39b81858bfefba3a315d8285fd52634'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 3 Aug 2007 14:37:58 +0000 (14:37 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 3 Aug 2007 14:37:58 +0000 (14:37 +0000)
     and '7674b4433c1bb9bc4645e63991d9d2fe659d8577'


Trivial merge