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

Trivial merge