Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Thu, 30 Aug 2012 21:15:14 +0000 (14:15 -0700)
committerGengbin Zheng <gzheng@illinois.edu>
Thu, 30 Aug 2012 21:15:14 +0000 (14:15 -0700)

Trivial merge