merge of '526e95d4cdf1cd30f201f0f6f8abbd0f7afbceab'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 7 Aug 2007 10:49:26 +0000 (10:49 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 7 Aug 2007 10:49:26 +0000 (10:49 +0000)
     and '614f3cd98efac6f55a67e861fea4265d5be81963'


Trivial merge