merge of 1c2bc7bfcd2c35cb60327cf7d30eae444c422cd5
authorKoen Kooi <koen@openembedded.org>
Tue, 8 Nov 2005 12:05:56 +0000 (12:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 8 Nov 2005 12:05:56 +0000 (12:05 +0000)
commit750e6ba2065a44f09667a66e49fd487264179d66
treee3e139f94bd317b3a2cd48c92d15626d5376f6ee
parent7e3e02c2c816d63487c2de2a4e1ea815f0725bf3
parentddfdc42ce0e9c07226c1a6390b03e5df4e731902
merge of 1c2bc7bfcd2c35cb60327cf7d30eae444c422cd5
     and bc093cfefa7d27266ba48a9cd3cd1ea47a251499