merge of '0f116f3500c10a0c6df76297f3ab887bebb2d8ad'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Aug 2007 19:54:29 +0000 (19:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Aug 2007 19:54:29 +0000 (19:54 +0000)
     and 'dce598404f82b5e5bef1adc1cc1d91fbfc2aecc2'


Trivial merge