Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Mon, 11 Apr 2011 19:50:56 +0000 (14:50 -0500)
committerAaron Becker <akbecker@gmail.com>
Mon, 11 Apr 2011 19:50:56 +0000 (14:50 -0500)

Trivial merge