Merge branch 'charm' of charmgit:charm into charm
authorXiang Ni <xiangni2@illinois.edu>
Fri, 28 Jan 2011 20:02:57 +0000 (14:02 -0600)
committerXiang Ni <xiangni2@illinois.edu>
Fri, 28 Jan 2011 20:02:57 +0000 (14:02 -0600)

Trivial merge