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)
     and 'ce38b7c27a6292900bf4749d07d4358565d30c53'


Trivial merge