Keep py3k and trunk code in sync.
1 file changed