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

Trivial merge