Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Fri, 17 Feb 2012 00:40:57 +0000 (18:40 -0600)
committerAaron Becker <akbecker@gmail.com>
Fri, 17 Feb 2012 00:40:57 +0000 (18:40 -0600)

Trivial merge