remove testdata for submodule
Added submodule test data
Merge branch 'master' into google_code

Conflicts:
	python/testdata