Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Fri, 17 Sep 2010 23:48:36 +0000 (18:48 -0500)
committerAaron Becker <akbecker@gmail.com>
Fri, 17 Sep 2010 23:48:36 +0000 (18:48 -0500)

Trivial merge