merge of '42c7569b1dc10cfed4aef02b04809e2247f3f535'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Sep 2007 06:18:24 +0000 (06:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Sep 2007 06:18:24 +0000 (06:18 +0000)
     and 'e0ffb9b29f40ba86057125fc2c1f717ffd362976'


Trivial merge