I'm just going to assume that all of these revisions don't need to be merge, since...

Blocked revisions 68559,68562,68565-68567,68569,68603-68605 via svnmerge

........
  r68559 | raymond.hettinger | 2009-01-12 16:58:41 -0600 (Mon, 12 Jan 2009) | 1 line

  Issue 1696199: Add collections.Counter().
........
  r68562 | raymond.hettinger | 2009-01-12 19:05:03 -0600 (Mon, 12 Jan 2009) | 7 lines

  Simplify Counter() API.  Replace items keyword argument
  with a mapping.  Makes Counter() idempotent, makes update()
  API the same as Counter.__init__(), makes a more readable
  repr, makes the API more dict-like, and allows Steven
  Bethard's update() example to work.
........
  r68565 | raymond.hettinger | 2009-01-12 21:49:43 -0600 (Mon, 12 Jan 2009) | 1 line

  Minor documentation tweaks and simpler update() example.
........
  r68566 | raymond.hettinger | 2009-01-12 22:13:53 -0600 (Mon, 12 Jan 2009) | 1 line

  Fixup and simplify docstrings and doctests.
........
  r68567 | raymond.hettinger | 2009-01-12 22:50:35 -0600 (Mon, 12 Jan 2009) | 1 line

  Speed-up __repr__.  Eliminate duplicate tests.  Use a from-irmport.
........
  r68569 | raymond.hettinger | 2009-01-13 02:38:14 -0600 (Tue, 13 Jan 2009) | 7 lines

  Add table of idioms/patterns for using Counter objects.
  Improve the appearance and flow of the References section -- it used
  to have a box around it that wasn't distinct from the preceding code
  boxes and it had a weird bolding pattern and hanging indents that
  made the section disproportionately large.
........
  r68603 | raymond.hettinger | 2009-01-13 18:15:21 -0600 (Tue, 13 Jan 2009) | 1 line

  Minor doc tweaks.
........
  r68604 | raymond.hettinger | 2009-01-13 19:15:06 -0600 (Tue, 13 Jan 2009) | 1 line

  Add tests for __init__() and update() with no args.
........
  r68605 | raymond.hettinger | 2009-01-13 19:39:51 -0600 (Tue, 13 Jan 2009) | 1 line

  Fix-up indentation of sample code blocks for namedtuple mthod definitions.
........