merge of 709370ff47e008ad6a103c7d32f5e8a3aa8b2eb9
authorMichael Lauer <mickey@vanille-media.de>
Fri, 28 Jul 2006 11:44:29 +0000 (11:44 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 28 Jul 2006 11:44:29 +0000 (11:44 +0000)
     and e273cc9b332aec7b5539c1f7def99a4b04fb8c9e


Trivial merge