Merge branch 'charm' of charmgit:charm into charm
authorFilippo Gioachin <gioachin@uiuc.edu>
Fri, 23 Apr 2010 21:18:10 +0000 (16:18 -0500)
committerFilippo Gioachin <gioachin@uiuc.edu>
Fri, 23 Apr 2010 21:18:10 +0000 (16:18 -0500)

Trivial merge