merge of 09016de82e8089016031f1df831bdc386449eec6
authorMichael Lauer <mickey@vanille-media.de>
Sat, 21 Oct 2006 11:03:47 +0000 (11:03 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 21 Oct 2006 11:03:47 +0000 (11:03 +0000)
     and 4a8ed832e405a639214a80e4fadd5935c6ce3a8b


Trivial merge