merge of '7dac65b6187ea9281e5a7ff6b68e832c04a92af8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 May 2008 12:28:09 +0000 (12:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 May 2008 12:28:09 +0000 (12:28 +0000)
     and '9dce9395fcd011a1d238dcb5a559a08d851dc80e'


Trivial merge