Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Fri, 9 Nov 2012 17:41:22 +0000 (11:41 -0600)
committerAaron Becker <akbecker@gmail.com>
Fri, 9 Nov 2012 17:41:22 +0000 (11:41 -0600)

Trivial merge