merge of '261e22bd3535ccf811a14529928bb45c658241c2'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 26 Oct 2007 16:42:08 +0000 (16:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 26 Oct 2007 16:42:08 +0000 (16:42 +0000)
commit7bfb05616d31ed91caca1627e28f26c93deeadbe
treefc40c6d2a29cf8e2473c89bfcae5de5a326bf368
parent40a3f64797e417d3e810861cb62d23d7c2af8110
parent4caf9d0d54ebf4d7ffbde43f9fb9019b074007ba
Merge ... '261e22bd3535ccf811a14529928bb45c658241c2'
     and 'c18beadc5b113fa9ca28944c4fd379127c3ba500'