Blocked revisions 85811 via svnmerge

........
  r85811 | r.david.murray | 2010-10-23 18:19:56 -0400 (Sat, 23 Oct 2010) | 2 lines

  #1349106: add linesep argument to generator.flatten and header.encode.
........