Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Thu, 26 Jan 2012 05:55:17 +0000 (21:55 -0800)
committerGengbin Zheng <gzheng@illinois.edu>
Thu, 26 Jan 2012 05:55:17 +0000 (21:55 -0800)

Trivial merge