Merge branch 'charm' of charmgit:charm into charm
authorNikhil Jain <nikhil@illinois.edu>
Mon, 22 Oct 2012 23:49:03 +0000 (18:49 -0500)
committerNikhil Jain <nikhil@illinois.edu>
Mon, 22 Oct 2012 23:49:03 +0000 (18:49 -0500)

Trivial merge