merge of '202111bb61d911d344b28edb3efaa90dd7b5839c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 30 May 2007 10:56:04 +0000 (10:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 30 May 2007 10:56:04 +0000 (10:56 +0000)
     and '74ef5538952e598d19b9a5948bf53799aba14426'


Trivial merge