Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Fri, 27 May 2011 18:49:10 +0000 (13:49 -0500)
committerAaron Becker <akbecker@gmail.com>
Fri, 27 May 2011 18:49:10 +0000 (13:49 -0500)

Trivial merge