Merge branch 'charm' of charmgit:charm into charm
authorIsaac Dooley <idooley2@bp-login1.(none)>
Thu, 29 Apr 2010 20:22:35 +0000 (15:22 -0500)
committerIsaac Dooley <idooley2@bp-login1.(none)>
Thu, 29 Apr 2010 20:22:35 +0000 (15:22 -0500)

Trivial merge