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)
commitf55e1cd950a96045de381abedde9e2727d001234
tree31c642152a1e8456d85bfa1bea0bbdc0db39e674
parent18bae0d61ca9ad3cb8970bbeedef55ad328bb422
parentd69d798924c7d9e543f7078e611ee8c410f2fad6
Merge ... '4f1c373d43a7c1b912b21780d67df8ccec796116'
     and 'd684223b6fbdf20a18d598446664827707b7dd91'