Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Wed, 8 Feb 2012 17:35:04 +0000 (11:35 -0600)
committerAaron Becker <akbecker@gmail.com>
Wed, 8 Feb 2012 17:35:04 +0000 (11:35 -0600)

Trivial merge