Merge branch 'charm' of charmgit:charm into charm
authorNikhil Jain <nikhil@illinois.edu>
Fri, 26 Oct 2012 17:54:35 +0000 (12:54 -0500)
committerNikhil Jain <nikhil@illinois.edu>
Fri, 26 Oct 2012 17:54:35 +0000 (12:54 -0500)

Trivial merge