Blocked revisions 65422 via svnmerge

........
  r65422 | antoine.pitrou | 2008-08-02 23:58:05 +0200 (Sat, 02 Aug 2008) | 1 line

  Preemptively backport the relevant parts of r65420
........