Merge branch 'charm' of /expand/home/gioachin/charm into charm
authorFilippo Gioachin <gioachin@uiuc.edu>
Wed, 8 Sep 2010 22:12:54 +0000 (17:12 -0500)
committerFilippo Gioachin <gioachin@uiuc.edu>
Wed, 8 Sep 2010 22:12:54 +0000 (17:12 -0500)

Trivial merge