Merge branch 'bug9975'

Conflicts:
	flashproxy-client
	flashproxy-reg-appspot
	flashproxy-reg-email
	flashproxy-reg-url
	flashproxy/reg.py