merge of '6176297db9843a4ee2b5a46d8c099ac11f0efdd6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 Mar 2007 16:26:20 +0000 (16:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 Mar 2007 16:26:20 +0000 (16:26 +0000)
commit65dc09e70bf1d092cbeaf51d4b99fa64b3d53bc2
tree726a7df65ef75207f427c05ca5ef70193eae9093
parent8707920ac505691fcfd99d3892098b297b2022a3
parente88fcc32fd9d0fbf9088f92fc48e14660fe05902
Merge ... '6176297db9843a4ee2b5a46d8c099ac11f0efdd6'
     and 'dd033c24f26b4f017ce97d2ca4593a7f74187445'