merge of '9c2f6fca7c62c837fc449c39821e20313450c4c3'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 19 Dec 2007 16:12:06 +0000 (16:12 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 19 Dec 2007 16:12:06 +0000 (16:12 +0000)
     and 'd77c641ef66d10c52a010ef3dc1759f9f48016c4'


Trivial merge