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

Trivial merge