merge of 'f0d37b436d1ce39437b94acd261109f04af36c38'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 May 2008 00:26:11 +0000 (00:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 May 2008 00:26:11 +0000 (00:26 +0000)
commit3453471db2dd362dbaf88008e9943f0f9ef6a8ea
tree1452162926d3f1585b2ff60d2ccf350cf846b6b1
parent052f30fc08d8513b0f3b2899c27ea1af905be51c
parentd2650c32dda929e118f0b53c500bc51a1dcefabe
Merge ... 'f0d37b436d1ce39437b94acd261109f04af36c38'
     and 'fe78c09ce0a1dbc69ac1b86f04d530c6790e6651'