merge of '434de93cfa2e4d34e3f4a19e5bff6130398e5d8f'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 15 Jan 2007 20:06:47 +0000 (20:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 15 Jan 2007 20:06:47 +0000 (20:06 +0000)
     and '43c38f4dda9e1b6f193bd92c89479423586dbe59'


Trivial merge