Merge branch 'V9_11_BR'

diff --cc idl/GEOM_Gen.idl
Simple merge

diff --cc src/GEOMAlgo/CMakeLists.txt
Simple merge

diff --cc src/GEOMAlgo/GEOMAlgo_KindOfName.hxx
Simple merge

diff --cc src/GEOMAlgo/GEOMAlgo_KindOfShape.hxx
Simple merge

diff --cc src/GEOMAlgo/GEOMAlgo_ShapeInfo.cxx
Simple merge

diff --cc src/GEOMAlgo/GEOMAlgo_ShapeInfo.hxx
Simple merge

diff --cc src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.cxx
Simple merge

diff --cc src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
Simple merge

diff --cc src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx
Simple merge

diff --cc src/GEOMUtils/GEOMUtils.cxx
Simple merge

diff --cc src/GEOMUtils/GEOMUtils.hxx
Simple merge

diff --cc src/GEOM_I/GEOM_Gen_i.cc
Simple merge

diff --cc src/GEOM_SWIG/geomBuilder.py
Simple merge

diff --cc src/MeasureGUI/MeasureGUI_WhatisDlg.cxx
Simple merge

diff --cc test/tests.set
Simple merge