Revert revision 4742.  How hard is it to understand "No bugfixes in 2.0"? This fix should be in 2.0.1, which will mirror the changes in 1.3.1.
Revert revision 4742.  How hard is it to understand "No bugfixes in 2.0"?
This fix should be in 2.0.1, which will mirror the changes in 1.3.1.

andrewyoung1991/scons,andrewyoung1991/scons,andrewyoung1991/scons,timj/scons,timj/scons,andrewyoung1991/scons,andrewyoung1991/scons,andrewyoung1991/scons,timj/scons,andrewyoung1991/scons,timj/scons,timj/scons,timj/scons,andrewyoung1991/scons,timj/scons,timj/scons,andrewyoung1991/scons,timj/scons