merge of '0a57519fa92d8220b35f8652e20fea9f7800058c'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 5 Mar 2008 23:47:52 +0000 (23:47 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 5 Mar 2008 23:47:52 +0000 (23:47 +0000)
     and '905ae47594d02fc2167e9ddde4d4b781dad04ac2'


Trivial merge