Merge branch 'newManual' of charmgit:charm into newManual
authorYanhua Sun <sun51@illinois.edu>
Thu, 2 Aug 2012 23:47:30 +0000 (18:47 -0500)
committerYanhua Sun <sun51@illinois.edu>
Thu, 2 Aug 2012 23:47:30 +0000 (18:47 -0500)

Trivial merge