Merge branch 'newManual' of charmgit:charm into newManual
authorRamprasad Venkataraman <ramv@illinois.edu>
Wed, 25 Jul 2012 18:01:25 +0000 (13:01 -0500)
committerRamprasad Venkataraman <ramv@illinois.edu>
Wed, 25 Jul 2012 18:01:25 +0000 (13:01 -0500)

Trivial merge