Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Tue, 7 Jun 2011 17:04:35 +0000 (12:04 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Tue, 7 Jun 2011 17:04:35 +0000 (12:04 -0500)
commitd8c24ecb30bb955973bf0de5d72c7194da909ddb
tree9f018bf4d666cec5992d829cafa9a417ec8ef7eb
parent356f90105343c8f47f36044a1168310178dfc874
parent39b1a2c2951bec58c205ffcccb555283cc582cf7
Merge branch 'charm' of charmgit:charm into charm
src/arch/util/machine-common.c