merge of '1c73904856884cc56a3b02b8110c11919575b238'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 3 Jul 2008 17:58:48 +0000 (17:58 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 3 Jul 2008 17:58:48 +0000 (17:58 +0000)
     and 'a422dee552d817f3e19c622778fb2321caa93c94'


Trivial merge