Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Sun, 16 Oct 2011 02:21:51 +0000 (21:21 -0500)
committerAaron Becker <akbecker@gmail.com>
Sun, 16 Oct 2011 02:21:51 +0000 (21:21 -0500)

Trivial merge