merge of '7a689ee422b77b79d4b13b0d7a7c7060c257c930'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 10 Mar 2008 13:50:26 +0000 (13:50 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 10 Mar 2008 13:50:26 +0000 (13:50 +0000)
     and '8fbb3c656df4e525b0de65e241599ee4cf1b2658'


Trivial merge