Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@illinois.edu>
Fri, 8 Feb 2013 05:29:37 +0000 (05:29 +0000)
committerYanhua Sun <sun51@illinois.edu>
Fri, 8 Feb 2013 05:29:37 +0000 (05:29 +0000)

Trivial merge