Merge branch 'newManual' of charmgit:charm into newManual
authorChao Mei <chaomei2@illinois.edu>
Tue, 24 Jul 2012 21:40:54 +0000 (16:40 -0500)
committerChao Mei <chaomei2@illinois.edu>
Tue, 24 Jul 2012 21:40:54 +0000 (16:40 -0500)

Trivial merge