merge of '3f5863be74aaf18d9f78fd1e075d3203cc282bdc'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 12 Jan 2008 15:22:59 +0000 (15:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 12 Jan 2008 15:22:59 +0000 (15:22 +0000)
     and 'eaee5612742a446def8bdaaa5b89c3cc8047332e'


Trivial merge