Merge branch 'charm' of charmgit:charm into charm
authorFilippo Gioachin <gioachin@uiuc.edu>
Wed, 7 Jul 2010 09:10:36 +0000 (04:10 -0500)
committerFilippo Gioachin <gioachin@uiuc.edu>
Wed, 7 Jul 2010 09:10:36 +0000 (04:10 -0500)

Trivial merge