merge of '93692aaac63b82b355275bee987480a1232079a1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 1 Jan 2008 13:32:40 +0000 (13:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 1 Jan 2008 13:32:40 +0000 (13:32 +0000)
     and 'ffd5dadc681850a711352c103d0f1547e77207ca'


Trivial merge