Merge branch 'charm' into typed_reductions
authorAaron Becker <akbecker@gmail.com>
Fri, 21 Jan 2011 00:45:55 +0000 (18:45 -0600)
committerAaron Becker <akbecker@gmail.com>
Fri, 21 Jan 2011 00:45:55 +0000 (18:45 -0600)

Trivial merge