Merged revisions 77266,77279 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77266 | kurt.kaiser | 2010-01-03 09:36:45 +0100 (So, 03 Jan 2010) | 6 lines

  r77152 to Doc/Makefile broke doc build due to (at least some) make
  binaries running clean prereq after checkout.
  1. So, fix the insane make call in build.sh - seems to solve it.
  2. Fix a missing redirection.
  3. Check in the rsync opts that actually work during upload.
........
  r77279 | georg.brandl | 2010-01-03 14:05:39 +0100 (So, 03 Jan 2010) | 1 line

  Update doc build step.
........
1 file changed