Merge branch 'charm' of charmgit:charm into charm
authorFilippo Gioachin <gioachin@uiuc.edu>
Tue, 25 May 2010 22:32:26 +0000 (17:32 -0500)
committerFilippo Gioachin <gioachin@uiuc.edu>
Tue, 25 May 2010 22:32:26 +0000 (17:32 -0500)

Trivial merge