merge of 'af022eaccf1ea1052c096be4c37accec350e9b27'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 20 Oct 2006 12:52:26 +0000 (12:52 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 20 Oct 2006 12:52:26 +0000 (12:52 +0000)
     and 'ec665a2227c0b81f567aec855a2e84ae2eb437a8'


Trivial merge