merge of 70b8885f91280693d7cbd223c133cdad1d106ca6
authorMichael Lauer <mickey@vanille-media.de>
Sat, 21 Oct 2006 11:03:50 +0000 (11:03 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 21 Oct 2006 11:03:50 +0000 (11:03 +0000)
commit9cb6683b10dcf0508e8982a497b10630d62af38e
tree79d61de45189437cf4f3ee3a4a7a9a771eec2298
parentd8655d2a77cd104c618056f273012c2286a82630
parent7a3ba22fdc53b371bd326dfb71e0db3d762933ae
merge of 70b8885f91280693d7cbd223c133cdad1d106ca6
     and 4b0133764e1b19133abfc5dd0dccaadce5f5593a