Merge branch 'bug9975'

Conflicts:
	flashproxy-client
	flashproxy-reg-appspot
	flashproxy-reg-email
	flashproxy-reg-http
	flashproxy-reg-url
	flashproxy/reg.py
	flashproxy/test/test_keys.py
	flashproxy/util.py