Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Sat, 30 Apr 2011 13:50:58 +0000 (08:50 -0500)
committerAaron Becker <akbecker@gmail.com>
Sat, 30 Apr 2011 13:50:58 +0000 (08:50 -0500)

Trivial merge