Sync trunk and py3k versions of string formatting. Will manually merge into py3k.
1 file changed