Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Wed, 22 Feb 2012 23:24:31 +0000 (17:24 -0600)
committerYanhua Sun <yanhuas@jyc1.(none)>
Wed, 22 Feb 2012 23:24:31 +0000 (17:24 -0600)
1  2 
src/arch/gemini_gni/machine.c

Simple merge