Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Thu, 22 Mar 2012 17:15:09 +0000 (12:15 -0500)
committerAaron Becker <akbecker@gmail.com>
Thu, 22 Mar 2012 17:15:09 +0000 (12:15 -0500)

Trivial merge