merge of '1d191d57e609530bf7d6ccd6705f7e63b0c24231'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 29 Oct 2007 15:10:38 +0000 (15:10 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 29 Oct 2007 15:10:38 +0000 (15:10 +0000)
     and '47227a7d14aad3fad97ac42c0f58256e043f95b7'


Trivial merge