Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Thu, 23 Feb 2012 18:18:56 +0000 (10:18 -0800)
committerGengbin Zheng <gzheng@illinois.edu>
Thu, 23 Feb 2012 18:18:56 +0000 (10:18 -0800)

Trivial merge