merge of '9fa037171b6c9f0d06ed8aa7dc11716dfbacebbf'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 5 Sep 2008 12:18:52 +0000 (12:18 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 5 Sep 2008 12:18:52 +0000 (12:18 +0000)
     and 'db7aa3c67ff99859a56b540059d1f21cc95da4b5'


Trivial merge