merge of '4bfcfd2edc67793c8c00682ad89309619eddab3a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Feb 2008 23:57:28 +0000 (23:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Feb 2008 23:57:28 +0000 (23:57 +0000)
     and 'eec0cf22d27780a5209f4aad8fee7ddaa6bb80a0'


Trivial merge