Merge branch 'newManual' of charmgit:charm into newManual
authorChao Mei <chaomei2@illinois.edu>
Fri, 27 Jul 2012 16:51:43 +0000 (11:51 -0500)
committerChao Mei <chaomei2@illinois.edu>
Fri, 27 Jul 2012 16:51:43 +0000 (11:51 -0500)

Trivial merge