Merge branch 'abecker/charj-main' into charm
authorAaron Becker <akbecker@gmail.com>
Wed, 26 May 2010 23:38:40 +0000 (18:38 -0500)
committerAaron Becker <akbecker@gmail.com>
Wed, 26 May 2010 23:38:40 +0000 (18:38 -0500)

Trivial merge