Merge commit 'charm/charm' into charm
authorFilippo Gioachin <gioachin@uiuc.edu>
Mon, 25 Jan 2010 23:09:58 +0000 (17:09 -0600)
committerFilippo Gioachin <gioachin@uiuc.edu>
Mon, 25 Jan 2010 23:09:58 +0000 (17:09 -0600)

Trivial merge