Merge commit 'upstream/1.2.0.d20100306'

8 files changed, 8 insertions, 8 deletions

diff --git a/src/engine/SCons/Node/Alias.py b/src/engine/SCons/Node/Alias.py
index 57596eb..0ea72a6 100644
--- a/src/engine/SCons/Node/Alias.py
+++ b/src/engine/SCons/Node/Alias.py
@@ -30,7 +30,7 @@ This creates a hash of global Aliases (dummy targets).
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Node/Alias.py 4629 2010/01/17 22:23:21 scons"
+__revision__ = "src/engine/SCons/Node/Alias.py 4691 2010/03/06 16:22:36 bdbaddog"
 
 import string
 import UserDict
diff --git a/src/engine/SCons/Node/AliasTests.py b/src/engine/SCons/Node/AliasTests.py
index adf6fa9..b737433 100644
--- a/src/engine/SCons/Node/AliasTests.py
+++ b/src/engine/SCons/Node/AliasTests.py
@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Node/AliasTests.py 4629 2010/01/17 22:23:21 scons"
+__revision__ = "src/engine/SCons/Node/AliasTests.py 4691 2010/03/06 16:22:36 bdbaddog"
 
 import sys
 import unittest
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 40c887f..95ac9b0 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -33,7 +33,7 @@ that can be used by scripts or modules looking for the canonical default.
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Node/FS.py 4629 2010/01/17 22:23:21 scons"
+__revision__ = "src/engine/SCons/Node/FS.py 4691 2010/03/06 16:22:36 bdbaddog"
 
 from itertools import izip
 import cStringIO
diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py
index e630862..2e9879a 100644
--- a/src/engine/SCons/Node/FSTests.py
+++ b/src/engine/SCons/Node/FSTests.py
@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Node/FSTests.py 4629 2010/01/17 22:23:21 scons"
+__revision__ = "src/engine/SCons/Node/FSTests.py 4691 2010/03/06 16:22:36 bdbaddog"
 
 import os
 import os.path
diff --git a/src/engine/SCons/Node/NodeTests.py b/src/engine/SCons/Node/NodeTests.py
index 1a0dcc6..fb8b9ac 100644
--- a/src/engine/SCons/Node/NodeTests.py
+++ b/src/engine/SCons/Node/NodeTests.py
@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Node/NodeTests.py 4629 2010/01/17 22:23:21 scons"
+__revision__ = "src/engine/SCons/Node/NodeTests.py 4691 2010/03/06 16:22:36 bdbaddog"
 
 import os
 import re
diff --git a/src/engine/SCons/Node/Python.py b/src/engine/SCons/Node/Python.py
index 2e42b6c..8266cf1 100644
--- a/src/engine/SCons/Node/Python.py
+++ b/src/engine/SCons/Node/Python.py
@@ -27,7 +27,7 @@ Python nodes.
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Node/Python.py 4629 2010/01/17 22:23:21 scons"
+__revision__ = "src/engine/SCons/Node/Python.py 4691 2010/03/06 16:22:36 bdbaddog"
 
 import SCons.Node
 
diff --git a/src/engine/SCons/Node/PythonTests.py b/src/engine/SCons/Node/PythonTests.py
index e815cbd..d2f4419 100644
--- a/src/engine/SCons/Node/PythonTests.py
+++ b/src/engine/SCons/Node/PythonTests.py
@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Node/PythonTests.py 4629 2010/01/17 22:23:21 scons"
+__revision__ = "src/engine/SCons/Node/PythonTests.py 4691 2010/03/06 16:22:36 bdbaddog"
 
 import sys
 import unittest
diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py
index 2ffadc2..5c54429 100644
--- a/src/engine/SCons/Node/__init__.py
+++ b/src/engine/SCons/Node/__init__.py
@@ -42,7 +42,7 @@ be able to depend on any other type of "thing."
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Node/__init__.py 4629 2010/01/17 22:23:21 scons"
+__revision__ = "src/engine/SCons/Node/__init__.py 4691 2010/03/06 16:22:36 bdbaddog"
 
 import copy
 from itertools import chain, izip