Merge branch 'charm' of charmgit:charm into charm
authorFilippo Gioachin <gioachin@uiuc.edu>
Wed, 2 Jun 2010 01:28:30 +0000 (20:28 -0500)
committerFilippo Gioachin <gioachin@uiuc.edu>
Wed, 2 Jun 2010 01:28:30 +0000 (20:28 -0500)

Trivial merge