Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Thu, 23 Feb 2012 07:31:02 +0000 (01:31 -0600)
committerYanhua Sun <yanhuas@jyc1.(none)>
Thu, 23 Feb 2012 07:31:02 +0000 (01:31 -0600)
commitbf7238ca4aa5bff19a90629564cf39f283087548
tree87337f5ea30b5a8db4d8c97b1ed6bad2f706523f
parent1b38763988093aac7da31a591aa3d44f4fdb50e5
parent49a83b83a6149b904bcb61e7a488d75213f36439
Merge branch 'charm' of charmgit:charm into charm
src/arch/gemini_gni/machine.c