merge of '4d6dbbd6409e2a93093659bf415ba3b79f7bc3f6'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 20 May 2008 22:52:14 +0000 (22:52 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 20 May 2008 22:52:14 +0000 (22:52 +0000)
     and 'b2a4a7fdee4979edfc6a17d3e6ff9a7ffeeb2ab9'


Trivial merge