Merge branch 'charm' of sarcasm:src/charm into charm
authorAaron Becker <akbecker@gmail.com>
Fri, 17 Sep 2010 16:26:17 +0000 (11:26 -0500)
committerAaron Becker <akbecker@gmail.com>
Fri, 17 Sep 2010 16:26:17 +0000 (11:26 -0500)

Trivial merge