merge of '2be5e752a15904554697d31fe1505320d26fd263'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Feb 2008 01:43:08 +0000 (01:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Feb 2008 01:43:08 +0000 (01:43 +0000)
commit11be4e50131c91525dcac42d8a1f3c12a217d1ac
tree6d013fc611eb5b64d4a41f8d80ffa59c15e163b9
parent916326780dc762bb84bb24526a0ed628fff3d602
parent1bd9cd965d8cbef3eeb9527284e246d2a526d41d
Merge ... '2be5e752a15904554697d31fe1505320d26fd263'
     and '7fb87889a6d8866e49a6b9607971f63a17c58c80'