merge of '1415f32ae312fabcfb6f1452dbd7ce897665ca88'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Oct 2008 17:36:26 +0000 (17:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Oct 2008 17:36:26 +0000 (17:36 +0000)
commit4fc0350debb067af2293141903b692c2f05a20b1
tree4c9096cd991275ad89b074de5b274fabb65bd06c
parent8e57ba12981ecc58d174d0c3c1a8a0cc69490896
parent227d3062aa5ab07b3b05ea219a658a4f9aba5962
Merge ... '1415f32ae312fabcfb6f1452dbd7ce897665ca88'
     and '6a04f6b10c819319120eee8f1e058fe39a818c6f'