Sync trunk and py3k versions of string formatting. Manual merge of r74219.
1 file changed