merge of '47c30ebda2c1ad0df303493ea5a7b149455d8202'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Oct 2007 06:52:56 +0000 (06:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Oct 2007 06:52:56 +0000 (06:52 +0000)
     and '49ebc80978a5a98291bc76a35b098b6ef4e9d24d'


Trivial merge