Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@illinois.edu>
Sun, 24 Jul 2011 16:22:07 +0000 (12:22 -0400)
committerYanhua Sun <sun51@illinois.edu>
Sun, 24 Jul 2011 16:22:07 +0000 (12:22 -0400)

Trivial merge