merge of '2277b45295ab7dc58f6d8041b5f9288e3b4cc638'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 15:19:05 +0000 (15:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 15:19:05 +0000 (15:19 +0000)
commit6f13603461ae93a3ba098290853dd68bb8815d4c
tree4cbb3514e55fc72186e3154a454937bdfb364c7f
parent6cdd43a86f465293cfb1d4e44d60dd4620f3d1f9
parentbdac33b55c60b405f0cd29fce157f80ecd05d300
Merge ... '2277b45295ab7dc58f6d8041b5f9288e3b4cc638'
     and 'a57f1e6461c2f62d675d4b6c4eaff3b48e75ebb3'