Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Fri, 4 Mar 2011 20:03:25 +0000 (14:03 -0600)
committerAaron Becker <akbecker@gmail.com>
Fri, 4 Mar 2011 20:03:25 +0000 (14:03 -0600)

Trivial merge