merge of '86aec156c9005ac5b6e746f4efd0249468f7a04e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Sep 2008 08:54:03 +0000 (08:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Sep 2008 08:54:03 +0000 (08:54 +0000)
commite29ee00a02566b444a951ef99f14f9fd9baf4478
treeb8ca94e1d855c7fe45a41d2150add12e17f6a2e0
parent21668aac5832507a3c1f741079249b51d35883df
parente1e93a30c4f5b9b6fd5dd2a2d8f9f1cfea9ef79d
Merge ... '86aec156c9005ac5b6e746f4efd0249468f7a04e'
     and 'f09f8f0cf40e82fd7a6a914eb75442c70a3afdc9'