merge of '82c93f18c011fcfde6381525fc552545ef51ee0f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 15 Jun 2007 22:01:49 +0000 (22:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 15 Jun 2007 22:01:49 +0000 (22:01 +0000)
     and 'dcf5a8a0ff71cf06020e1db14987020b861053d6'


Trivial merge