merge of '3f22aef1071f8e9e535b0ffeaf877f12c7db3eda'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 7 Jun 2007 02:22:05 +0000 (02:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 7 Jun 2007 02:22:05 +0000 (02:22 +0000)
     and 'baa72ec99fdbfdc18f1dac1c0424570a760d47e6'


Trivial merge