merge of '4628d4ecb47157250aa2bda58f024a5abc413eff'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 7 Mar 2007 15:29:07 +0000 (15:29 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 7 Mar 2007 15:29:07 +0000 (15:29 +0000)
     and 'f08623e938f9152f6bb6ce2389d6fdac3b1215c0'


Trivial merge