merge of '8f49a303307612ac522fcb5f02663262b08cbd0d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 27 Feb 2007 17:43:42 +0000 (17:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 27 Feb 2007 17:43:42 +0000 (17:43 +0000)
     and '9734d0f4adaf001ab22698b8cab8498c54f04e32'


Trivial merge