Merge branch 'newManual' of charmgit:charm into newManual
authorRamprasad Venkataraman <ramv@illinois.edu>
Tue, 24 Jul 2012 22:03:18 +0000 (17:03 -0500)
committerRamprasad Venkataraman <ramv@illinois.edu>
Tue, 24 Jul 2012 22:03:18 +0000 (17:03 -0500)

Trivial merge