Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@illinois.edu>
Fri, 29 Jul 2011 03:29:43 +0000 (23:29 -0400)
committerYanhua Sun <sun51@illinois.edu>
Fri, 29 Jul 2011 03:29:43 +0000 (23:29 -0400)

Trivial merge