merge of '3021686956bdcf5b95480557bdd87b8892e303a8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 17 Nov 2007 13:50:07 +0000 (13:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 17 Nov 2007 13:50:07 +0000 (13:50 +0000)
commit5bfb99281a42b7cfccd4cb25c4c4f7c6fe36b243
treeb5f14f4233972b452907a668ebda17239f35f7da
parent3b9a91139a1cc962e1b2801c9b900a9999f86841
parent6ffbeff63c5cc4d843c1325e2acd7eab4d059be9
Merge ... '3021686956bdcf5b95480557bdd87b8892e303a8'
     and 'a1d56e481ec69ff77b7fdd13cc367cb58d64396e'