Merge branch 'charm' into charj2
authorAaron Becker <akbecker@gmail.com>
Tue, 30 Oct 2012 05:36:14 +0000 (00:36 -0500)
committerAaron Becker <akbecker@gmail.com>
Tue, 30 Oct 2012 05:36:14 +0000 (00:36 -0500)

Trivial merge