Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Mon, 23 Aug 2010 20:48:13 +0000 (15:48 -0500)
committerAaron Becker <akbecker@gmail.com>
Mon, 23 Aug 2010 20:48:13 +0000 (15:48 -0500)

Trivial merge