Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Fri, 28 Oct 2011 03:54:43 +0000 (20:54 -0700)
committerGengbin Zheng <gzheng@illinois.edu>
Fri, 28 Oct 2011 03:54:43 +0000 (20:54 -0700)

Trivial merge