Merge branch 'charm' of charmgit:charm into charm
authorIsaac Dooley <idooley2@illinois.edu>
Fri, 19 Mar 2010 16:14:02 +0000 (11:14 -0500)
committerIsaac Dooley <idooley2@illinois.edu>
Fri, 19 Mar 2010 16:14:02 +0000 (11:14 -0500)

Trivial merge