Merge branch 'charm' of charmgit:charm into charm
authorNikhil Jain <nikhil@illinois.edu>
Sun, 13 Nov 2011 20:05:07 +0000 (14:05 -0600)
committerNikhil Jain <nikhil@illinois.edu>
Sun, 13 Nov 2011 20:05:07 +0000 (14:05 -0600)

Trivial merge