Merge branch 'charm' of charmgit:charm into charm
authorFilippo Gioachin <gioachin@uiuc.edu>
Fri, 4 Jun 2010 03:27:01 +0000 (22:27 -0500)
committerFilippo Gioachin <gioachin@uiuc.edu>
Fri, 4 Jun 2010 03:27:01 +0000 (22:27 -0500)

Trivial merge