Merge branch 'charm' of git://charm.cs.illinois.edu/charm into charm
authorNikhil Jain <nikhilj@bp-login1.(none)>
Tue, 8 Mar 2011 23:00:03 +0000 (17:00 -0600)
committerNikhil Jain <nikhilj@bp-login1.(none)>
Tue, 8 Mar 2011 23:00:03 +0000 (17:00 -0600)

Trivial merge