Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Thu, 17 Mar 2011 07:37:34 +0000 (07:37 +0000)
committerGengbin Zheng <gzheng@illinois.edu>
Thu, 17 Mar 2011 07:37:34 +0000 (07:37 +0000)

Trivial merge