Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Fri, 28 May 2010 23:57:39 +0000 (18:57 -0500)
committerAaron Becker <akbecker@gmail.com>
Fri, 28 May 2010 23:57:39 +0000 (18:57 -0500)

Trivial merge