Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Thu, 23 Feb 2012 21:55:03 +0000 (15:55 -0600)
committerGengbin Zheng <gzheng@illinois.edu>
Thu, 23 Feb 2012 21:55:03 +0000 (15:55 -0600)

Trivial merge