merge of 0ba38ca13b8f9b76c025b96b9273d2a9d620deaa
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Sep 2006 10:13:42 +0000 (10:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 19 Sep 2006 10:13:42 +0000 (10:13 +0000)
     and 33bc45d7294bae196268df2bd28ee3862534411c


Trivial merge