Merged svnmerge-integrated property from branches/core to trunk. Merged in with...
authorgaryo <garyo@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Fri, 15 Aug 2008 02:35:48 +0000 (02:35 +0000)
committergaryo <garyo@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Fri, 15 Aug 2008 02:35:48 +0000 (02:35 +0000)
commitdd38d2c8e529432a46f7391ff279057ffda4f5de
treeadc52550b4d86a0e271c7bb31b65020c873d23f1
parent452e1d0a7ad9962ba4cc517d7585a9fb4d7a8428
Merged svnmerge-integrated property from branches/core to trunk.  Merged in with old value already on trunk.

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