Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Sat, 31 Dec 2011 17:50:03 +0000 (09:50 -0800)
committerGengbin Zheng <gzheng@illinois.edu>
Sat, 31 Dec 2011 17:50:03 +0000 (09:50 -0800)

Trivial merge