Merge commit 'charm/charm' into virtualDebug
authorFilippo Gioachin <gioachin@uiuc.edu>
Thu, 22 Apr 2010 21:43:49 +0000 (16:43 -0500)
committerFilippo Gioachin <gioachin@uiuc.edu>
Thu, 22 Apr 2010 21:43:49 +0000 (16:43 -0500)

Trivial merge