Merge branch 'charm' of charmgit:charm into charm
authorNikhil Jain <nikhil@illinois.edu>
Wed, 5 Sep 2012 15:13:53 +0000 (08:13 -0700)
committerNikhil Jain <nikhil@illinois.edu>
Wed, 5 Sep 2012 15:13:53 +0000 (08:13 -0700)

Trivial merge