merge of '8aa66e0c1d1c620b98f480aa98ee13d966d94dab'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 Mar 2007 17:00:35 +0000 (17:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 Mar 2007 17:00:35 +0000 (17:00 +0000)
commit2df3b015934b915f58a4bde3e3b60b630b6650e2
treebf0958fa131cffb930d231ee888d25cab6a95569
parent621811d946e0ae7d5b0b8069192c8b13b53dcbfa
parent88ebf69d40fad41b9a6bab4073cdb34960918dfa
Merge ... '8aa66e0c1d1c620b98f480aa98ee13d966d94dab'
     and '9ca12d4c1092b7f51c07aaf5538a0dd211ca0cfe'