Merge branch 'charm' of charmgit:charm into charm
authorHarshitha <gplkrsh2@illinois.edu>
Tue, 21 Feb 2012 22:40:53 +0000 (16:40 -0600)
committerHarshitha <gplkrsh2@illinois.edu>
Tue, 21 Feb 2012 22:40:53 +0000 (16:40 -0600)

Trivial merge