Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Thu, 23 Sep 2010 21:56:42 +0000 (16:56 -0500)
committerAaron Becker <akbecker@gmail.com>
Thu, 23 Sep 2010 21:56:42 +0000 (16:56 -0500)

Trivial merge