These revisions were merged manaually:

Blocked revisions 64062,64068-64069,64080 via svnmerge

........
  r64062 | josiah.carlson | 2008-06-10 00:00:08 -0500 (Tue, 10 Jun 2008) | 5 lines

  Applying updated patch from Issue 1736190, which addresses partial
  issues in: 909005 and 17361001, as well as completely as possible issues
  539444, 760475, 777588, 889153, 953599, 1025525, 1063924, and 658749.
  This patch also includes doc and test updates as necessary.
........
  r64068 | benjamin.peterson | 2008-06-10 08:37:13 -0500 (Tue, 10 Jun 2008) | 2 lines

  fix markup
........
  r64069 | georg.brandl | 2008-06-10 08:53:24 -0500 (Tue, 10 Jun 2008) | 2 lines

  more markup fix.
........
  r64080 | josiah.carlson | 2008-06-10 10:58:19 -0500 (Tue, 10 Jun 2008) | 3 lines

  Fixed test to reflect new filedispatcher semantics, as well as two
  NameErrors pointed out by Giampaolo.
........