Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Thu, 13 Oct 2011 00:44:24 +0000 (19:44 -0500)
committerAaron Becker <akbecker@gmail.com>
Thu, 13 Oct 2011 00:44:24 +0000 (19:44 -0500)

Trivial merge