merge of '4f67bea2562b34f365d7ca6807e88dc68459418f'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 21 Jul 2007 23:24:57 +0000 (23:24 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 21 Jul 2007 23:24:57 +0000 (23:24 +0000)
     and 'd7f98d5dc21d49fa11962464baefb4ec32e5b204'


Trivial merge