Merge branch 'charm' of charmgit:charm into charm
authorIsaac Dooley <idooley2@bp-login1.(none)>
Tue, 4 May 2010 15:05:00 +0000 (10:05 -0500)
committerIsaac Dooley <idooley2@bp-login1.(none)>
Tue, 4 May 2010 15:05:00 +0000 (10:05 -0500)

Trivial merge