Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Fri, 23 Mar 2012 05:52:07 +0000 (00:52 -0500)
committerYanhua Sun <yanhuas@jyc1.(none)>
Fri, 23 Mar 2012 05:52:07 +0000 (00:52 -0500)
commit4ab5a966bb31b11f808a2db11f32aff89aa14166
treea4182799ce50e3b748ac6f323d85c254216839b3
parent4e8ef1d9d52dceff2779da3ec9d755d2507c1a18
parent14b06e53e6b104562499afee6f9052097c48972d
Merge branch 'charm' of charmgit:charm into charm
src/arch/gemini_gni/machine.c