Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@illinois.edu>
Sat, 13 Oct 2012 04:45:14 +0000 (23:45 -0500)
committerYanhua Sun <sun51@illinois.edu>
Sat, 13 Oct 2012 04:45:14 +0000 (23:45 -0500)

Trivial merge