merge of '90c9a3c552c3bc731dad4d54e5e92acc8d37eb6d'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 13 Feb 2008 11:21:17 +0000 (11:21 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 13 Feb 2008 11:21:17 +0000 (11:21 +0000)
     and 'f3ae86a7e3727c818dc1f9d62c2fe35ab49f951c'


Trivial merge