merge of '716838c61d439ea48ec596bb358e6fe8674c26fe'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 11 Jun 2008 15:54:10 +0000 (15:54 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 11 Jun 2008 15:54:10 +0000 (15:54 +0000)
     and '99ed4d92c897fb19999e63a3d7eb3b5fae762ff3'


Trivial merge