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)
commit100524fe26dbea61ac540774560fc0836162d9a3
tree4263b654489a05af8a283890d55b9af8690bc40b
parent608b1f799fab8b89c87fa80b53cba5d3501aee0e
parent1f87f587cee7ad24aec7de80fffed99b4474b93c
Merge ... '3cbff562ea1dadcb0389c60560607c1904a047a3'
     and '5c95887193f22b95f009766012950685c58b3e0f'