Merge commit 'charm/charm' into charm
authorFilippo Gioachin <gioachin@uiuc.edu>
Wed, 20 Jan 2010 02:53:49 +0000 (20:53 -0600)
committerFilippo Gioachin <gioachin@uiuc.edu>
Wed, 20 Jan 2010 02:53:49 +0000 (20:53 -0600)

Trivial merge