Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Thu, 20 May 2010 20:46:17 +0000 (15:46 -0500)
committerAaron Becker <akbecker@gmail.com>
Thu, 20 May 2010 20:46:17 +0000 (15:46 -0500)

Trivial merge