merge of '664c903716e2388f94905f48588afd5542b78fc6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 21:49:13 +0000 (21:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 21:49:13 +0000 (21:49 +0000)
commit6864473901da68f1264082a0e2102296abc75018
tree03789a48a18805970b371765dad5bbec945694a6
parent07994e63b927880cf9e20c30da34fc0f84ab65b5
parent1662a5910f06141d3ca1b37cbae114a4f2efe64e
Merge ... '664c903716e2388f94905f48588afd5542b78fc6'
     and '7f8cad96c8dde93c85aa34ce420a3a852cbdf6ad'