merge of 54d4c3d2efb39c8c1b9e97c60b643eb6791d12a4
authorMichael Lauer <mickey@vanille-media.de>
Sun, 21 Jan 2007 23:03:22 +0000 (23:03 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 21 Jan 2007 23:03:22 +0000 (23:03 +0000)
     and d41ab66a53746790b53abecf4b629956ff6a4d25


Trivial merge