merge of '14192674bf83ffad052bdcede44d1d342962d3cf'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jan 2008 13:47:24 +0000 (13:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jan 2008 13:47:24 +0000 (13:47 +0000)
     and '8dd93c6476c0007dddb9f4352def801f43f16339'


Trivial merge