Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Sat, 14 Jan 2012 05:34:29 +0000 (23:34 -0600)
committerGengbin Zheng <gzheng@illinois.edu>
Sat, 14 Jan 2012 05:34:29 +0000 (23:34 -0600)

Trivial merge