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

Trivial merge