Merge branch 'charm' of git://charm.cs.uiuc.edu/charm into charm
authorRalf Gunter <ralfgunter@gmail.com>
Mon, 23 Jul 2012 09:15:38 +0000 (04:15 -0500)
committerRalf Gunter <ralfgunter@gmail.com>
Mon, 23 Jul 2012 09:15:38 +0000 (04:15 -0500)

Trivial merge