Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@illinois.edu>
Tue, 29 Jan 2013 06:04:44 +0000 (00:04 -0600)
committerYanhua Sun <sun51@illinois.edu>
Tue, 29 Jan 2013 06:04:44 +0000 (00:04 -0600)

Trivial merge