merge of '56ab51a0342466f50234f11f4d4685b642943d6a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Oct 2008 01:38:21 +0000 (01:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Oct 2008 01:38:21 +0000 (01:38 +0000)
commit405af4acf4c38300e5d9a6492d349f26e6b239f0
treea1e62118a181b6c0ad6b02ccebdfce8a1aa89ccf
parent6363e3b999c1600278e2f65cde6e3f839211299d
parentcc25c30cd5285bda5f6043e6f27fa819498c6a0b
Merge ... '56ab51a0342466f50234f11f4d4685b642943d6a'
     and 'd247017786a0b1f7180e909014da50635ba53f26'