Merge branch 'charm' of charmgit:charm into charm
authorXiang Ni <xiangni2@illinois.edu>
Thu, 25 Oct 2012 23:29:58 +0000 (18:29 -0500)
committerXiang Ni <xiangni2@illinois.edu>
Thu, 25 Oct 2012 23:29:58 +0000 (18:29 -0500)

Trivial merge