merge of '330fb172df78da5ccf19876c4fa2be87783aea08'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 10 Jul 2007 21:39:51 +0000 (21:39 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 10 Jul 2007 21:39:51 +0000 (21:39 +0000)
     and '340ff84700df308d945fb6efde89fbb319ff1a84'


Trivial merge