Merge branch 'charj2' into charm
authorAaron Becker <akbecker@gmail.com>
Fri, 2 Nov 2012 15:52:44 +0000 (10:52 -0500)
committerAaron Becker <akbecker@gmail.com>
Fri, 2 Nov 2012 15:52:44 +0000 (10:52 -0500)

Trivial merge