merge of 7d9d43a22af37a8b4ac0bfcbea925695287659e7
authorMichael Lauer <mickey@vanille-media.de>
Thu, 19 Oct 2006 10:48:15 +0000 (10:48 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 19 Oct 2006 10:48:15 +0000 (10:48 +0000)
     and 91bf3046a7b6ef29616d05dbbd8897b75fdf8d13


Trivial merge