merge of '5f9ded38d3bb3f4a0369515dbb717e835f0acc61'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 31 Mar 2008 22:25:13 +0000 (22:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 31 Mar 2008 22:25:13 +0000 (22:25 +0000)
     and '774a9654f13013fc4f169930d4cfec26a95b97e5'


Trivial merge