merge of 27992ad903b456bde0a40788a183fd1b84d95beb
authorMichael Lauer <mickey@vanille-media.de>
Fri, 13 Oct 2006 12:48:39 +0000 (12:48 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 13 Oct 2006 12:48:39 +0000 (12:48 +0000)
     and 45a56df6cfb8cc83a1c1f9896a655ddb77db51bc


Trivial merge