merge of '59cab1cf7e6555c78e83160548945b0b63b193a9'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 23 Oct 2007 08:15:40 +0000 (08:15 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 23 Oct 2007 08:15:40 +0000 (08:15 +0000)
commitca914bc4804bf812c1f61350f6487bc60f48b25a
treeb0be733764553b307c8b3dd6f71d5a608a4be97f
parent1298d6404cf24b1a441a553ebc7a104330ea3d54
parent3f758c05135682e27e6fa1f4b85003e4a406510d
Merge ... '59cab1cf7e6555c78e83160548945b0b63b193a9'
     and '5db403bd5d17402720832bf15a2ac01a04220cad'