merge of '8f2c3c8fa725eadc5ae26c7316aa404636f58ad4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 28 Jul 2007 18:32:14 +0000 (18:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 28 Jul 2007 18:32:14 +0000 (18:32 +0000)
commitfd52093b0bfb959993e6f5ac92c21b0594a701f9
treed022878a8a485be5dea8ea6ef0a092bca1feb7ea
parent9a337765328ec21356f9715df149f9308369691f
parentb4e0ee5f0f61d1ee977ee7129c6881bc7a7e4726
Merge ... '8f2c3c8fa725eadc5ae26c7316aa404636f58ad4'
     and 'f4ee8a6396717740a1e631355d0789d10ed8add0'