merge of '0889940ec663116e303d3707d6b956c87e72d44f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 17 Apr 2008 12:55:46 +0000 (12:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 17 Apr 2008 12:55:46 +0000 (12:55 +0000)
     and 'ee3ad2493af2387eb64e902bf01ee6665bc3fe99'


Trivial merge