merge of '91b1890c469c39d7efcba63967f106bf6efd0c4f'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 16 Oct 2007 13:47:03 +0000 (13:47 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 16 Oct 2007 13:47:03 +0000 (13:47 +0000)
     and 'ce9648eef13f1ef5d8dff88dc64af875993364e9'


Trivial merge