merge of 'a5786ab89a3fad9f406eb5b5c5d8a3dde24be1ba'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 13 Aug 2008 08:41:03 +0000 (08:41 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 13 Aug 2008 08:41:03 +0000 (08:41 +0000)
     and 'c5f94f2e7a0afd67fafc1a2f867ddf8f10dbc2e9'


Trivial merge