Merge branch 'charm' of charmgit:charm into charm
authorNikhil Jain <nikhil@illinois.edu>
Thu, 10 Nov 2011 04:05:22 +0000 (22:05 -0600)
committerNikhil Jain <nikhil@illinois.edu>
Thu, 10 Nov 2011 04:05:22 +0000 (22:05 -0600)

Trivial merge