Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Thu, 21 Jun 2012 20:43:06 +0000 (15:43 -0500)
committerAaron Becker <akbecker@gmail.com>
Thu, 21 Jun 2012 20:43:06 +0000 (15:43 -0500)

Trivial merge