Merge branch 'charm' of git://charm.cs.illinois.edu/charm into charm