Merge branch 'bug9975'

Conflicts:
	flashproxy-client
	flashproxy/reg.py