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)
1  2 
src/arch/gemini_gni/machine.c

Simple merge