merge of '056153b8d72df761dd453a0744b47f49b1526274'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 3 Aug 2007 13:48:01 +0000 (13:48 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 3 Aug 2007 13:48:01 +0000 (13:48 +0000)
     and '84faa8309d20a2d72895ea64790f085a69d15fab'


Trivial merge