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

Trivial merge