Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Sat, 22 Oct 2011 03:01:08 +0000 (22:01 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Sat, 22 Oct 2011 03:01:08 +0000 (22:01 -0500)

Trivial merge