Merge branch 'newManual' of charmgit:charm into newManual
authorAaron Becker <akbecker@gmail.com>
Wed, 22 Aug 2012 23:00:12 +0000 (18:00 -0500)
committerAaron Becker <akbecker@gmail.com>
Wed, 22 Aug 2012 23:00:12 +0000 (18:00 -0500)

Trivial merge