merge of '706f1474ece6a6a01e4446a03863512f82c3f4a7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Nov 2007 21:05:50 +0000 (21:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Nov 2007 21:05:50 +0000 (21:05 +0000)
commit68925b84824d54938e0e9fc9c11e509ee172c887
tree88e420e801db9d0a508de480985fb681229d52d6
parent0249d06d8d34f207012ec1b6d73c4266589b1f5e
parent1e5e4a1ed7ac5ea8fbce000eff75340805fb2d77
Merge ... '706f1474ece6a6a01e4446a03863512f82c3f4a7'
     and '73900e49333ff8602be6bc97757ef21d80d1134e'