Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Tue, 21 Dec 2010 03:20:31 +0000 (21:20 -0600)
committerAaron Becker <akbecker@gmail.com>
Tue, 21 Dec 2010 03:20:31 +0000 (21:20 -0600)

Trivial merge