merge of '9518b4f4eabaf4a22b686fd2ade256eee6952b47'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 12 Apr 2007 09:45:05 +0000 (09:45 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 12 Apr 2007 09:45:05 +0000 (09:45 +0000)
commitb13a271ac57e40a271227d26601cd770f1a9e0ec
treebf41f9e5dd7c56b48cc67fc247d14d18f01ee9fe
parentd1ec8e1f3a65c64337b3dc9bd84c3142a07525a9
parentf4e239bb262baa864dcdeb345cb250f3954e7cb7
Merge ... '9518b4f4eabaf4a22b686fd2ade256eee6952b47'
     and 'caf171b00ab12ba420cb827d1a33a5d972e3b4df'