merge of 'f24ed430bf3ceb0d538a87543ba12756657e820e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 May 2008 13:23:18 +0000 (13:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 May 2008 13:23:18 +0000 (13:23 +0000)
     and 'f9a7308abb2bdd098705726bcaf19639473187de'


Trivial merge