Merge branch 'charm' of git://charm.cs.uiuc.edu/charm into charm
authorJonathan Lifflander <jliffl2@illinois.edu>
Mon, 25 Jan 2010 21:54:56 +0000 (15:54 -0600)
committerJonathan Lifflander <jliffl2@illinois.edu>
Mon, 25 Jan 2010 21:54:56 +0000 (15:54 -0600)

Trivial merge