Blocked revisions 68243,68395,68432 via svnmerge

........
  r68243 | georg.brandl | 2009-01-03 16:15:42 -0600 (Sat, 03 Jan 2009) | 2 lines

  Add temporary code to fix the automatic doc build failure.
........
  r68395 | raymond.hettinger | 2009-01-08 00:39:04 -0600 (Thu, 08 Jan 2009) | 1 line

  Forward port r68394 for issue 4816.
........
  r68432 | benjamin.peterson | 2009-01-08 21:15:00 -0600 (Thu, 08 Jan 2009) | 1 line

  remove temporary code now
........