merge of '06dece86b19a87ce894b51a9a4596d0dd10aa368'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 11 Jul 2007 11:14:05 +0000 (11:14 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 11 Jul 2007 11:14:05 +0000 (11:14 +0000)
     and 'f6d341299c43235d3c37dbbb33a02a56ea8370c3'


Trivial merge