Merge branch 'charm' of charmgit:charm into charm
authorNikhil Jain <nikhil@illinois.edu>
Mon, 14 Nov 2011 00:00:39 +0000 (18:00 -0600)
committerNikhil Jain <nikhil@illinois.edu>
Mon, 14 Nov 2011 00:00:39 +0000 (18:00 -0600)

Trivial merge