merge of '3cbff562ea1dadcb0389c60560607c1904a047a3'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 22 Apr 2008 11:41:49 +0000 (11:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 22 Apr 2008 11:41:49 +0000 (11:41 +0000)
     and '5c95887193f22b95f009766012950685c58b3e0f'


Trivial merge