merge of '0f1b9dcedb4d611ce7ce7ca8935b934dbc44061c'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 7 Feb 2008 13:08:35 +0000 (13:08 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 7 Feb 2008 13:08:35 +0000 (13:08 +0000)
     and '8dadec7d9f47d3e60f4729a152204227dce39c49'


Trivial merge