merge of '3acc599523c89258a0e3bf8dd3a98c692ad3b555'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 2 Aug 2007 16:31:59 +0000 (16:31 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 2 Aug 2007 16:31:59 +0000 (16:31 +0000)
     and 'f1003174f8c7f99c993d4a46fe0221bdbf197e7d'


Trivial merge