merge of '3ca13f192fc91b43bec662e6b0faf653dd6821b0'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 2 Jun 2007 18:21:30 +0000 (18:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 2 Jun 2007 18:21:30 +0000 (18:21 +0000)
commit65f4f9a4f9e79a26d86899ec2cecb4a46cdb79aa
tree85aa5b4d668c63953aec78b9b17c11518ac53e20
parent4eb166a0f1b8c0db307a5289e3c6db9f913e3f85
parente5428e2948ece74a974d96d8826b0da644d8bb9a
Merge ... '3ca13f192fc91b43bec662e6b0faf653dd6821b0'
     and '96a6065c1531d9a86a1395316c6aa84f4cdf97fd'