merge of '2700039073a3760641797b52ac5897f2eee3d92a'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 27 Jul 2008 10:32:12 +0000 (10:32 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 27 Jul 2008 10:32:12 +0000 (10:32 +0000)
     and 'ddb3262e0fe9acfe7d20567e33ef27bcfe0d0801'


Trivial merge