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)
     and 4b0133764e1b19133abfc5dd0dccaadce5f5593a


Trivial merge