Merge branch 'newManual' of charmgit:charm into newManual
authorYanhua Sun <sun51@illinois.edu>
Tue, 24 Jul 2012 21:11:11 +0000 (16:11 -0500)
committerYanhua Sun <sun51@illinois.edu>
Tue, 24 Jul 2012 21:11:11 +0000 (16:11 -0500)

Trivial merge