merge of '2160ef6a1176c4f7a49c5f831509721ea75cd35b'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 18 Jan 2008 14:15:39 +0000 (14:15 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 18 Jan 2008 14:15:39 +0000 (14:15 +0000)
     and '9a37a94626c4cf51ec6e7f7d6995599fb462f838'


Trivial merge