Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Sun, 25 Apr 2010 02:07:55 +0000 (21:07 -0500)
committerAaron Becker <akbecker@gmail.com>
Sun, 25 Apr 2010 02:07:55 +0000 (21:07 -0500)

Trivial merge