Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@hopper07.(none)>
Thu, 8 Mar 2012 23:03:52 +0000 (15:03 -0800)
committerYanhua Sun <sun51@hopper07.(none)>
Thu, 8 Mar 2012 23:03:52 +0000 (15:03 -0800)
commit43bf94bce562417549182b4d40122a187e1ced14
tree315703822a2881f57b97e33ee68d6399ed24eb32
parent727d2c6e22ff58faf95051d2df3b78d885715d8d
parent6bc5ef7da3aa42d00053cc7680a14257efe4ee42
Merge branch 'charm' of charmgit:charm into charm

Conflicts:
src/arch/gemini_gni/machine.c
src/arch/gemini_gni/machine.c