Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Mon, 13 Feb 2012 00:18:29 +0000 (18:18 -0600)
committerYanhua Sun <yanhuas@jyc1.(none)>
Mon, 13 Feb 2012 00:18:29 +0000 (18:18 -0600)
1  2 
src/arch/gemini_gni/machine.c

Simple merge