merge of '0fd25dfc18f365d3b975a9657dae8f1afebdfbc1'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 22 Aug 2007 11:38:40 +0000 (11:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 22 Aug 2007 11:38:40 +0000 (11:38 +0000)
     and 'e542d3248b64e2f2a33ea5db5feb00bd3806167d'


Trivial merge