Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Fri, 29 Oct 2010 20:19:13 +0000 (15:19 -0500)
committerAaron Becker <akbecker@gmail.com>
Fri, 29 Oct 2010 20:19:13 +0000 (15:19 -0500)

Trivial merge