Merged revisions 4645,4647-4651,4654-4656 via svnmerge from

Merged revisions 4645,4647-4651,4654-4656 via svnmerge from
http://scons.tigris.org/svn/scons/branches/pending

........
  r4648 | managan | 2010-01-22 09:40:52 -0800 (Fri, 22 Jan 2010) | 9 lines

  Added dismbiguate calls on a targets side effects in the
  make_ready_all and make_ready_current routines of Taskmaster.py.
  This fixes Stefan Hepp's problem with latex. Directories to
  hold the side effect files were not created when using
  variantDir with duplicate=0

  Modifying subdir_variantdir_include2.py to run scons with an
  explicit target to reveal this problem.
........
  r4654 | stevenknight | 2010-01-27 07:41:01 -0800 (Wed, 27 Jan 2010) | 5 lines

  Issue 2534:  fix Scanners' default ability to return Dir nodes by
  making the default node_class the real SCons.Node.FS.Base class,
  not SCons.Node.FS.Entry (which is now, and has been for some time,
  a subclass).
........

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