Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Mon, 14 Jun 2010 15:55:20 +0000 (10:55 -0500)
committerAaron Becker <akbecker@gmail.com>
Mon, 14 Jun 2010 15:55:20 +0000 (10:55 -0500)

Trivial merge