Merge branch 'charm' of charmgit:charm into charm
authorFilippo Gioachin <gioachin@uiuc.edu>
Sat, 16 Oct 2010 02:56:09 +0000 (21:56 -0500)
committerFilippo Gioachin <gioachin@uiuc.edu>
Sat, 16 Oct 2010 02:56:09 +0000 (21:56 -0500)

Trivial merge