merge of '0b6354a57db70b62eccbe5522490947545014f85'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 25 Oct 2007 16:17:01 +0000 (16:17 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 25 Oct 2007 16:17:01 +0000 (16:17 +0000)
commite30a33ca971f9ad5b265d98ddb173fc0b7a8e22e
treebb911141bd9f583f1c4999e8d71b8f5f32d34ffc
parent5aa891aadd2e06ecc54f1f0e189c508fe230f866
parenta5043b9fc5a07402f3d9b88f619cf2905bdca5b1
Merge ... '0b6354a57db70b62eccbe5522490947545014f85'
     and 'bfb3f591b7494217c22a8a5b6daf3902bdd7cd03'