merge of 'acd8437858f09a96cbc55521caf58591895661d7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 15:52:54 +0000 (15:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 15:52:54 +0000 (15:52 +0000)
commit627c3f58f437396c37777e587ccee1131b5cb278
tree22d3be881b2590daa3bff89d3a5c153b9cff51b0
parent6f13603461ae93a3ba098290853dd68bb8815d4c
parent5d8f738cf7ed725999080306ced731f55e64f4c9
Merge ... 'acd8437858f09a96cbc55521caf58591895661d7'
     and 'd131b2a91c76f28316eb023acdc7d81fb7a42044'