merge of '8f24f687fb1ef557bf1f1a9e66188d67dde2ea47'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 10 Sep 2007 15:44:58 +0000 (15:44 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 10 Sep 2007 15:44:58 +0000 (15:44 +0000)
     and 'bc1bceb6bfab051d162269a77df02ea351b62358'


Trivial merge