merge of '80b03b9b2ade5007c82ff741d46a20be8538e263'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 4 Jun 2007 15:30:18 +0000 (15:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 4 Jun 2007 15:30:18 +0000 (15:30 +0000)
     and 'f4c8ae3396278e2cdf79e100dca4845cca94c5d1'


Trivial merge