Merge branch 'charm' into dev
authorFilippo Gioachin <gioachin@uiuc.edu>
Wed, 10 Feb 2010 01:42:07 +0000 (19:42 -0600)
committerFilippo Gioachin <gioachin@uiuc.edu>
Wed, 10 Feb 2010 01:42:07 +0000 (19:42 -0600)

Trivial merge