merge of '01874aea004ac1a1ba9f8bc4a31eb07bd7865027'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Sep 2008 13:59:06 +0000 (13:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Sep 2008 13:59:06 +0000 (13:59 +0000)
     and 'ac34d32574e42042c7afc4d0500547c97cf87132'


Trivial merge