merge of '64e8fcf86d823ff35b714a70b3125d2fc95ded55'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 21 Feb 2008 10:46:35 +0000 (10:46 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 21 Feb 2008 10:46:35 +0000 (10:46 +0000)
     and '7cc9c98056838b4d2eb67baf00c13e220ae94a0a'


Trivial merge