merge of '12ff563eb00759b6cae9ecfc5c1400f246dcd533'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 16 Oct 2006 13:32:42 +0000 (13:32 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 16 Oct 2006 13:32:42 +0000 (13:32 +0000)
     and '3763af0dd8f9b6f2ec526ab6fcef3a00efd7576e'


Trivial merge