merge of '04e7fd23b654ca78723da82bfeaf289b3d013aae'
authorKoen Kooi <koen@openembedded.org>
Wed, 26 Jul 2006 16:05:19 +0000 (16:05 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 26 Jul 2006 16:05:19 +0000 (16:05 +0000)
commit89b5272c5f627859ba5fc45ad5d0c21cfef84373
tree8488d691666ab7e664b7d84f3437384e8a96f660
parentd04d35bd963361ffe580c95830e791b21fa8d87e
parenta37d7ceccbd994913b06a8120ae0f4c6a8737074
Merge ... '04e7fd23b654ca78723da82bfeaf289b3d013aae'
     and '8799855818ba7f133d8510597a9131212edb14a8'