Merge branch 'charm' of charmgit:charm into charm
authorIsaac Dooley <idooley2@illinois.edu>
Thu, 18 Mar 2010 15:32:32 +0000 (10:32 -0500)
committerIsaac Dooley <idooley2@illinois.edu>
Thu, 18 Mar 2010 15:32:32 +0000 (10:32 -0500)

Trivial merge