merge of 'da96891a2ca8b58603eeace03f70b31bdb83f534'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 12 Aug 2008 13:29:28 +0000 (13:29 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 12 Aug 2008 13:29:28 +0000 (13:29 +0000)
     and 'ff29d35506adb74555e6297276dcbf0d5adfba55'


Trivial merge