merge of '086f28dc642c28a49acc6fa22f6423d6ba5cef7d'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 30 Nov 2007 20:50:25 +0000 (20:50 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 30 Nov 2007 20:50:25 +0000 (20:50 +0000)
     and 'd2bef6ae1a0cfb013070a22132d2c8c69fdf19e1'


Trivial merge