Merge branch 'charm' into amicableErrorMessages
authorAaron Becker <akbecker@gmail.com>
Fri, 14 Sep 2012 22:28:06 +0000 (17:28 -0500)
committerAaron Becker <akbecker@gmail.com>
Fri, 14 Sep 2012 22:28:06 +0000 (17:28 -0500)

Trivial merge