Merged revisions 3909-4041,4043-4049 via svnmerge from

Merged revisions 3909-4041,4043-4049 via svnmerge from
http://scons.tigris.org/svn/scons/checkpoint

........
  r4041 | stevenknight | 2009-02-23 07:06:15 -0800 (Mon, 23 Feb 2009) | 2 lines

  Fix embedded carriage returns so merge will apply cleanly.
........
  r4043 | stevenknight | 2009-02-23 08:47:32 -0800 (Mon, 23 Feb 2009) | 2 lines

  Update release identification for the checkpoint.
........
  r4044 | stevenknight | 2009-02-23 09:04:28 -0800 (Mon, 23 Feb 2009) | 2 lines

  Add files that conflicted when re-merging.
........

git-svn-id: http://scons.tigris.org/svn/scons/trunk@4050 fdb21ef1-2011-0410-befe-b5e4ea1792b1