merge of '4f1c373d43a7c1b912b21780d67df8ccec796116'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 16:17:33 +0000 (16:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 16:17:33 +0000 (16:17 +0000)
     and 'd684223b6fbdf20a18d598446664827707b7dd91'


Trivial merge