Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Fri, 26 Mar 2010 05:13:03 +0000 (00:13 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Fri, 26 Mar 2010 05:13:03 +0000 (00:13 -0500)

Trivial merge