Merge branch 'charm' of charmgit:charm into charm
authorFilippo Gioachin <gioachin@uiuc.edu>
Thu, 20 May 2010 00:52:18 +0000 (19:52 -0500)
committerFilippo Gioachin <gioachin@uiuc.edu>
Thu, 20 May 2010 00:52:18 +0000 (19:52 -0500)

Trivial merge