Blocked revisions 86170 via svnmerge

........
  r86170 | eric.smith | 2010-11-04 13:06:58 -0400 (Thu, 04 Nov 2010) | 1 line

  Issue #6081: Add str.format_map. str.format_map(mapping) is similar to str.format(**mapping), except mapping does not get converted to a dict.
........