Merge branch 'abn/rearch'

Conflicts:
	src/PV_SWIG/VTKWrapping/paravisSM.py -- file deleted!

diff --cc CMakeLists.txt
index 2adec08bec9dbc8db384090730982cfb74fc8e9b,c41977b7c90a1e3799a29c6d4177c2e7b35a15e1..52680155b5eecfe6ad162a961d9f68519637348c
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -78,7 -78,7 +78,7 @@@ OPTION(SALOME_PARAVIS_ALL_TEST "Add al
  OPTION(SALOME_PARAVIS_BUILD_PLUGINS "Build PARAVIS plugins (MEDReader, etc ...)" ON)
  CMAKE_DEPENDENT_OPTION(SALOME_LIGHT_ONLY "Build SALOME Light only (no CORBA)" OFF
                         "NOT SALOME_KERNEL_LIGHT_ONLY" ON)
--CMAKE_DEPENDENT_OPTION(SALOME_PARAVIS_MINIMAL_CORBA "Build PARAVIS with a minimal CORBA interface" OFF
++CMAKE_DEPENDENT_OPTION(SALOME_PARAVIS_MINIMAL_CORBA "Build PARAVIS with a minimal CORBA interface" ON
                         "NOT SALOME_LIGHT_ONLY" ON)
  
  IF(SALOME_BUILD_TESTS)

diff --cc src/Plugins/MEDReader/IO/vtkMEDReader.cxx
Simple merge