merge of '49c84354677555417bff9c94bd9bb6ada73a166c'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 27 Sep 2008 12:58:46 +0000 (12:58 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 27 Sep 2008 12:58:46 +0000 (12:58 +0000)
     and 'daf2e2e41b4cfe60e4b4b29f0e7b8ad83261bff3'


Trivial merge