merge of '21552d6d6a52b72f70dbeebd78da48da3acf2af8'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 22 Jul 2008 13:36:26 +0000 (13:36 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 22 Jul 2008 13:36:26 +0000 (13:36 +0000)
     and 'c04c9a166ef26b29f2dd6b75191fb1b7b586a9c6'


Trivial merge