merge of 8025b1031a3e4a5ddd61c6a7a3f4788138fa0264
authorMichael Lauer <mickey@vanille-media.de>
Fri, 11 Aug 2006 17:41:05 +0000 (17:41 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 11 Aug 2006 17:41:05 +0000 (17:41 +0000)
     and fa44dacbf0a1b7a188ab4126d217aafc5a1f48f8


Trivial merge