Merge branch 'charm' of charmgit:charm into charm
authorNikhil Jain <nikhil@illinois.edu>
Fri, 30 Sep 2011 20:19:17 +0000 (15:19 -0500)
committerNikhil Jain <nikhil@illinois.edu>
Fri, 30 Sep 2011 20:19:17 +0000 (15:19 -0500)

Trivial merge