Merge branch 'charm' of charmgit:charm into charm
authorNikhil Jain <nikhil@illinois.edu>
Mon, 17 Sep 2012 16:47:16 +0000 (09:47 -0700)
committerNikhil Jain <nikhil@illinois.edu>
Mon, 17 Sep 2012 16:47:16 +0000 (09:47 -0700)

Trivial merge