Merge branch 'charm' of charmgit:charm into charm
authorNikhil Jain <nikhil@illinois.edu>
Tue, 4 Oct 2011 07:50:50 +0000 (02:50 -0500)
committerNikhil Jain <nikhil@illinois.edu>
Tue, 4 Oct 2011 07:50:50 +0000 (02:50 -0500)

Trivial merge