merge of '7484bb8b957706d9249511a6a73b62f70db94929'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 15 Oct 2006 14:42:29 +0000 (14:42 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 15 Oct 2006 14:42:29 +0000 (14:42 +0000)
commite9209ce1af2831989d30ada8855bef83096c264e
treed3f8955fe8b5962af33d26c5f2bb38fb291dff3a
parentee3eeb5f7fdde0d7a8dec06e404d96006775916f
parent0511ff581c94e28d184e379e46efb19a1e56ae78
Merge ... '7484bb8b957706d9249511a6a73b62f70db94929'
     and 'cd494fdef6a7adeea4481f5aee353408cbfaf6f4'