merge of '685f49aca74594ca1579d7481b11e07b315708e8'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 8 Mar 2007 22:13:15 +0000 (22:13 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 8 Mar 2007 22:13:15 +0000 (22:13 +0000)
     and 'fb386b14fd62e2255bdaaa1edca0a4ad6adf82c9'


Trivial merge