Merge branch 'newManual' of charmgit:charm into newManual
authorLaxmikant Kale <kale@illinois.edu>
Tue, 31 Jul 2012 20:19:10 +0000 (15:19 -0500)
committerLaxmikant Kale <kale@illinois.edu>
Tue, 31 Jul 2012 20:19:10 +0000 (15:19 -0500)

Trivial merge