merge of '641a15c42908d49a2d22b32302275bdcee06d601'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 16 Jul 2008 07:52:48 +0000 (07:52 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 16 Jul 2008 07:52:48 +0000 (07:52 +0000)
     and 'bcdca45c1b2872acd0f00daa6d38395d0d5867d1'


Trivial merge