Merge branch 'charm' of charmgit:charm into charm
authorIsaac Dooley <idooley2@bp-login1.(none)>
Sat, 3 Apr 2010 16:47:04 +0000 (11:47 -0500)
committerIsaac Dooley <idooley2@bp-login1.(none)>
Sat, 3 Apr 2010 16:47:04 +0000 (11:47 -0500)

Trivial merge