merge of '58e9f09193fc3310302cb57483cca72a70c0f6f9'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 10 Nov 2007 00:27:26 +0000 (00:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 10 Nov 2007 00:27:26 +0000 (00:27 +0000)
commit601498dea4d09a88926c3f6200e7618b4f4fdfef
treed760c3b877fde9063ba77aae9125543d74447d35
parent72b607d8c92ab09643d69ab42d5639d698c8ffec
parentf59b535f9088166e9d8c267bc5062ee5397d49e7
Merge ... '58e9f09193fc3310302cb57483cca72a70c0f6f9'
     and '669002f7b6f5c856c074448bc75bf86099ab5f11'