mozilla/browserid — pull request #2135 by lloyd (2012-07-21 22:53:39+00:00)
Title: Issues 2088 and 2104

submitted on behalf of shane. this is his four commits rebased onto current dev. see issue #2129 for his comments.