merge of '096edaed3a6739fb64cde01545b29713ce12a1b6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Aug 2008 16:24:18 +0000 (16:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Aug 2008 16:24:18 +0000 (16:24 +0000)
commit23ccc2156ae978b7183877bd884396a22f5c168c
treec35d9dae5c4b640728e1c201e05d2e672371d76f
parent4dcd21c260b9f282072eb8074c759125eb904daf
parent7fa14f6bdd0c11f6e6c8ab4aa384fceb19d2fbbc
Merge ... '096edaed3a6739fb64cde01545b29713ce12a1b6'
     and 'ce38b7c27a6292900bf4749d07d4358565d30c53'