Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Wed, 14 Dec 2011 16:53:52 +0000 (10:53 -0600)
committerAaron Becker <akbecker@gmail.com>
Wed, 14 Dec 2011 16:53:52 +0000 (10:53 -0600)

Trivial merge