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


Trivial merge