merge of '397efbec9ac99e7d5a70da62efbdb0739257baec'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 13 Aug 2007 17:22:14 +0000 (17:22 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 13 Aug 2007 17:22:14 +0000 (17:22 +0000)
     and '73007e84fa4bb064d168541a555f54c32aa7d072'


Trivial merge