merge of '7c68840f9e61bf1b24bfe84c80958a929056fec3'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 Oct 2007 11:40:52 +0000 (11:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 Oct 2007 11:40:52 +0000 (11:40 +0000)
commit3cb96795dad398bf226f9a5f5c0ce634d8c6d7ed
treeecf0871b72e83e14cab5221e3b5ec1a5424c15e0
parentedf3f6303198ef4f95ed15ad9addc33bca2d16fb
parentae2a8be8fdf994e3a8c62635f78f8e96c11a554d
Merge ... '7c68840f9e61bf1b24bfe84c80958a929056fec3'
     and '96b052b9c5046dbbfa151a054726f9e9b67d7e7e'