Comment 17 for bug 566046

Upstream ack'ed the patch and committed it with a slight refinement, confirmed that the password shouldnt' be there at all (it's not a (bad) design choice to make those extra keyrings work), and I tested the hell out of it now.

Discussed with Steve and we agreed to push this into final, I uploaded it to unapproved now.