Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Tue, 1 Feb 2011 21:20:23 +0000 (15:20 -0600)
committerAaron Becker <akbecker@gmail.com>
Tue, 1 Feb 2011 21:20:23 +0000 (15:20 -0600)

Trivial merge