Merge branch 'charm' of charmgit:charm into charm emenese2/fast_mlog
authorChao Mei <chaomei2@illinois.edu>
Fri, 24 Aug 2012 18:59:17 +0000 (13:59 -0500)
committerChao Mei <chaomei2@illinois.edu>
Fri, 24 Aug 2012 18:59:17 +0000 (13:59 -0500)

Trivial merge