merge of 'b5baf49fc7cdce9f5faaa2e3303b691a5a10b339'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 27 Feb 2007 17:25:04 +0000 (17:25 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 27 Feb 2007 17:25:04 +0000 (17:25 +0000)
     and 'de4deac18489c08635d1feef74f49bd72dce1d64'


Trivial merge