merge of '15b74f4a5710e603d60db9716cb6cb0619511ac7'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 31 Jul 2007 16:21:16 +0000 (16:21 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 31 Jul 2007 16:21:16 +0000 (16:21 +0000)
commit2e61dfe7129ee23bc41ba1ada89eedf3245a16ca
tree7d0ad528141ab948a7afd6093e53c2c5f169b29a
parentf89fc38904e333aaa0ab588a741087b32564987d
parent0adc9ee1289b5437b6386a44060117a8a5207f01
Merge ... '15b74f4a5710e603d60db9716cb6cb0619511ac7'
     and '8961e177cdb0b701e3bb0304ec24d5c4a3947254'