Merge branch 'charm' of charmgit:charm into charm
authorHarshitha <gplkrsh2@illinois.edu>
Fri, 26 Oct 2012 21:17:10 +0000 (16:17 -0500)
committerHarshitha <gplkrsh2@illinois.edu>
Fri, 26 Oct 2012 21:17:10 +0000 (16:17 -0500)

Trivial merge