merge of '1f9075ae3f232cc2e5b6024d908c97361fa4cd82'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 15 Jan 2008 15:45:23 +0000 (15:45 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 15 Jan 2008 15:45:23 +0000 (15:45 +0000)
     and '8996304d45d20965f75c306e6317a0238f26fbf7'


Trivial merge