merge of '8db34d3c922bc225d441090dfb421dad9abdcaa9'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 9 Mar 2007 17:20:53 +0000 (17:20 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 9 Mar 2007 17:20:53 +0000 (17:20 +0000)
     and 'fff6cc2d7bc3a5a08648ad1b6fdca8471ad318b9'


Trivial merge