merge of '00cf1e9e9df723231465c5cf66641ccf532f713a'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 3 Jul 2008 12:57:07 +0000 (12:57 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 3 Jul 2008 12:57:07 +0000 (12:57 +0000)
     and 'e238a221b694e010f2ded33d137e1ca76dec2b4f'


Trivial merge