Merge branch 'charm' of charmgit:charm into charm
authorFilippo Gioachin <gioachin@uiuc.edu>
Mon, 5 Jul 2010 05:34:14 +0000 (00:34 -0500)
committerFilippo Gioachin <gioachin@uiuc.edu>
Mon, 5 Jul 2010 05:34:14 +0000 (00:34 -0500)

Trivial merge