merge of '2a9f522bb79ea664167e746c79c80fe0d104c20f'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 18 Apr 2007 12:45:56 +0000 (12:45 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 18 Apr 2007 12:45:56 +0000 (12:45 +0000)
     and 'b2448d9d2bf369b829dab2b33b95bd7d54fcf1f4'


Trivial merge