Merge branch 'bug9975'

Conflicts:
	flashproxy-reg-appspot
	flashproxy-reg-email
	flashproxy/test/test_keys.py