merge of '175617edcda6a7db0736cb199971e613308f4f28'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 15 May 2008 21:22:00 +0000 (21:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 15 May 2008 21:22:00 +0000 (21:22 +0000)
     and 'e53a5cd6a7325c8cfa3079fff6e7e086127f125c'


Trivial merge