Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Mon, 9 Jan 2012 22:31:23 +0000 (14:31 -0800)
committerGengbin Zheng <gzheng@illinois.edu>
Mon, 9 Jan 2012 22:31:23 +0000 (14:31 -0800)
commit6f5d38e39e80a0440a51f0e429283eabcf0e291d
treef17275d2f1ada49de2738d1a3b99644b1ddb28db
parentda891c64e37a95a6388252524ea5f0e62f44d6ba
parentaf295183fad45e9cb1eb8085afebd3f6d30915c9
Merge branch 'charm' of charmgit:charm into charm