Merge branch 'charm' of charmgit:charm into charm
authorIsaac Dooley <idooley2@bp-login1.(none)>
Tue, 4 May 2010 16:32:34 +0000 (11:32 -0500)
committerIsaac Dooley <idooley2@bp-login1.(none)>
Tue, 4 May 2010 16:32:34 +0000 (11:32 -0500)

Trivial merge