merge of '560558ea6e0ea810e06402a8fd1e19d8c46e68c6'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 8 Jul 2008 12:26:40 +0000 (12:26 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 8 Jul 2008 12:26:40 +0000 (12:26 +0000)
     and 'b6fba5effb9e585b64323f16d607259748d6246f'


Trivial merge