merge of '30ed2981d1b51e1b7515fb7bad6e1447ce6ab4e5'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 22 Mar 2007 18:01:19 +0000 (18:01 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 22 Mar 2007 18:01:19 +0000 (18:01 +0000)
     and 'bbd309bb8f001be39eda61e970699d345467347c'


Trivial merge