merge of '8515621d878af9f9ba13e5c5340fd7da893d0666'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 27 Apr 2007 10:46:50 +0000 (10:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 27 Apr 2007 10:46:50 +0000 (10:46 +0000)
commita1f0100c6592a41f3c21b0f94821d3e48310e689
tree837654384df85922163b9093420e81837aa6e294
parent39bfd6436cea5f93f8d429b650beeb587af0cec8
parenta837e9fb766b377d84953db611ffe35a6b1e606a
Merge ... '8515621d878af9f9ba13e5c5340fd7da893d0666'
     and 'c9156882c7a9571536d48876ec434ff48dc2c80a'