Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Wed, 4 Jan 2012 21:09:55 +0000 (13:09 -0800)
committerGengbin Zheng <gzheng@illinois.edu>
Wed, 4 Jan 2012 21:09:55 +0000 (13:09 -0800)

Trivial merge