merge of '4376f9289c7953564a7a857551248e86d2f56bc0'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 11 Jun 2007 17:26:46 +0000 (17:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 11 Jun 2007 17:26:46 +0000 (17:26 +0000)
     and 'bc21e707c3e812b35e2e6b7365ded989cae46f31'


Trivial merge