merge of '7dac65b6187ea9281e5a7ff6b68e832c04a92af8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 May 2008 12:28:09 +0000 (12:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 May 2008 12:28:09 +0000 (12:28 +0000)
commite76451904db72c3c11570d43f74bc056e71ef5f7
treed5e85c2c80ec2a34cf3431bdfbf752bd505e16b3
parent7ec7a16d70b3b4ae5cfd7d65f93119a5e6ae4a84
parent81920b835e3cc8b87f27d3989627cce477ff23c5
Merge ... '7dac65b6187ea9281e5a7ff6b68e832c04a92af8'
     and '9dce9395fcd011a1d238dcb5a559a08d851dc80e'