Merge branch 'charm' of charmgit:charm into charm
authorHarshitha <gplkrsh2@illinois.edu>
Mon, 2 Apr 2012 17:24:41 +0000 (12:24 -0500)
committerHarshitha <gplkrsh2@illinois.edu>
Mon, 2 Apr 2012 17:24:41 +0000 (12:24 -0500)

Trivial merge