Merge branch 'charm' of charmgit:charm into charm
authorFilippo Gioachin <gioachin@uiuc.edu>
Tue, 12 Oct 2010 01:25:39 +0000 (20:25 -0500)
committerFilippo Gioachin <gioachin@uiuc.edu>
Tue, 12 Oct 2010 01:25:39 +0000 (20:25 -0500)

Trivial merge