merge of '6fcfd7c187e5bfdb019983b87124ddc80af2462d'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 16 Oct 2006 10:40:04 +0000 (10:40 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 16 Oct 2006 10:40:04 +0000 (10:40 +0000)
     and '9e9e3622c67f2361a31af731db0685c576144665'


Trivial merge