merge of '2c4ce910697bba06555153194e59aa010346bb7c'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 2 Aug 2007 15:23:39 +0000 (15:23 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 2 Aug 2007 15:23:39 +0000 (15:23 +0000)
commitaec58ee07ec82bc25841e37fd9a3ef7cd6b7ce6c
treeeeb8b20895a57f44134a2d2ee24c99a2f70afa0b
parent0f8d2f94ea9b713f9de60f489e463ccdec9f56dd
parent18bd2cd9fcfbc519d49c02d9980c632c33b44dc0
Merge ... '2c4ce910697bba06555153194e59aa010346bb7c'
     and '8b8fb841c5173c325347c89a0c911e34aff7fdd3'