Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Wed, 6 Oct 2010 00:29:36 +0000 (19:29 -0500)
committerAaron Becker <akbecker@gmail.com>
Wed, 6 Oct 2010 00:29:36 +0000 (19:29 -0500)

Trivial merge