ENH: Merge changes from main tree into VTK-5-0 branch. (cvs -q up -j1.9 -j1.10 CMake/vtkTclTkMacros.cmake)