Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Thu, 15 Apr 2010 13:49:13 +0000 (08:49 -0500)
committerAaron Becker <akbecker@gmail.com>
Thu, 15 Apr 2010 13:49:13 +0000 (08:49 -0500)

Trivial merge