Merge branch 'charm' of charmgit:charm into charm
authorNikhil Jain <nikhil@illinois.edu>
Wed, 16 Nov 2011 09:31:44 +0000 (03:31 -0600)
committerNikhil Jain <nikhil@illinois.edu>
Wed, 16 Nov 2011 09:31:44 +0000 (03:31 -0600)

Trivial merge