merge of '01e31e6ccd75ddf643280f27490975f2e499a82a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Nov 2007 20:28:00 +0000 (20:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Nov 2007 20:28:00 +0000 (20:28 +0000)
commite6828e108b14cdf34b55ec3bde55905194010c4e
treef69037909063ea7f416065e20a36b84aec44c332
parentb862a1bd52650bc917b14fff6aec186e881160a3
parent69a8b4053ee2673dad2a1255adc59bc1fb2bca29
Merge ... '01e31e6ccd75ddf643280f27490975f2e499a82a'
     and 'dcf02285d808869be79389e20e77afe25dfb8734'