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

Trivial merge