Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Thu, 20 Sep 2012 21:48:33 +0000 (16:48 -0500)
committerAaron Becker <akbecker@gmail.com>
Thu, 20 Sep 2012 21:48:33 +0000 (16:48 -0500)

Trivial merge