Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@illinois.edu>
Fri, 7 Dec 2012 04:23:41 +0000 (22:23 -0600)
committerYanhua Sun <sun51@illinois.edu>
Fri, 7 Dec 2012 04:23:41 +0000 (22:23 -0600)

Trivial merge