merge of '1400bcc94161f278ffef24927913738f7baefb58'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 18 Aug 2007 13:01:20 +0000 (13:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 18 Aug 2007 13:01:20 +0000 (13:01 +0000)
     and 'faf15e6fba7d554cc2bcffcfcc5601be8b383539'


Trivial merge