Merge branch 'charm' of charmgit:charm into charm
authorBilge Acun <acun2@illinois.edu>
Wed, 5 Jun 2013 22:41:25 +0000 (17:41 -0500)
committerBilge Acun <acun2@illinois.edu>
Wed, 5 Jun 2013 22:41:25 +0000 (17:41 -0500)

Trivial merge