Merged changes in the trunk up to revision 41225.
[blender-staging.git] / build_files / scons / tools / __init__.py