merge of '8819bbf6f539509b1d3b6df6a827db9c8050a2e3'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 22 Jan 2008 10:46:14 +0000 (10:46 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 22 Jan 2008 10:46:14 +0000 (10:46 +0000)
commit7f16c8f7c28a641bad535cf11f913fb881ead01c
tree5f8d04533f42a3592a341da638dfe162635bf785
parent202cdecd6746fbc98375154ad6e7885690627e05
parentafd58cdcce656ced784bfca78d7d96e2edca8cee
Merge ... '8819bbf6f539509b1d3b6df6a827db9c8050a2e3'
     and 'adb47d7ef0b6d4d6be87bfe0025501107f2d04cc'