Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Thu, 31 Mar 2011 18:40:47 +0000 (13:40 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Thu, 31 Mar 2011 18:40:47 +0000 (13:40 -0500)

Trivial merge