Merge commit 'origin/charm' into charm
authorGengbin Zheng <gzheng@illinois.edu>
Sun, 11 Apr 2010 02:26:51 +0000 (21:26 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Sun, 11 Apr 2010 02:26:51 +0000 (21:26 -0500)

Trivial merge