merge of '23bb0a8c4f3ff02382510526c89865eec5758b71'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 23 Oct 2006 15:16:02 +0000 (15:16 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 23 Oct 2006 15:16:02 +0000 (15:16 +0000)
     and 'e9cc6897a9a437e57ba2a9981767654a5d04d336'


Trivial merge