merge of '6fc0c96303daaec8c718677c1ab7b0cc440ab4be'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Nov 2007 16:54:35 +0000 (16:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Nov 2007 16:54:35 +0000 (16:54 +0000)
commit634e2b7f84c19f313cf07e27ec68be0ebe80fab0
tree25f006aefb317fbc545e17306a2c5dcbcaac3c38
parent863dee02bab26c60c86337e3da2849cbc0985276
parent0ef4b5c5b4ae1de2eaff7120bc332e31110a777c
Merge ... '6fc0c96303daaec8c718677c1ab7b0cc440ab4be'
     and 'f2599a639a2bce74fd29be0a3fe3b529e9d37493'