merge of '6d44b490ec30acc0370a045d7b1eb3eae2b73ab9'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 15 Jan 2008 11:53:51 +0000 (11:53 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 15 Jan 2008 11:53:51 +0000 (11:53 +0000)
     and 'e1ff6c067cf71593cf346579bbde3ddb8880cc0c'


Trivial merge