Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Wed, 18 Jan 2012 04:03:30 +0000 (20:03 -0800)
committerGengbin Zheng <gzheng@illinois.edu>
Wed, 18 Jan 2012 04:03:30 +0000 (20:03 -0800)

Trivial merge