Merge branch 'newManual' of charmgit:charm into newManual
authorYanhua Sun <sun51@illinois.edu>
Mon, 23 Jul 2012 21:53:50 +0000 (16:53 -0500)
committerYanhua Sun <sun51@illinois.edu>
Mon, 23 Jul 2012 21:53:50 +0000 (16:53 -0500)

Trivial merge