Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Wed, 1 Dec 2010 19:28:11 +0000 (13:28 -0600)
committerAaron Becker <akbecker@gmail.com>
Wed, 1 Dec 2010 19:28:11 +0000 (13:28 -0600)

Trivial merge