Merge remote-tracking branch 'origin/master'

diff --combined src/SMESH_SWIG/smeshBuilder.py
index bd9966d40f171d4387c7768332265cfa5b6f17e6,d7caf52638dbd11dcaee78bf4b85b31f2ee33e71..d8366f4d401324188753c9e7dd68a982eae5837a
--- 1/src/SMESH_SWIG/smeshBuilder.py
--- 2/src/SMESH_SWIG/smeshBuilder.py
+++ b/src/SMESH_SWIG/smeshBuilder.py
@@@ -231,7 -231,7 +231,7 @@@ def TreatHypoStatus(status, hypName, ge
          reason = hypType + " of the same dimension is already assigned to this shape"
      elif status == HYP_BAD_DIM :
          reason = hypType + " mismatches the shape"
-     elif status == HYP_CONCURENT :
+     elif status == HYP_CONCURRENT :
          reason = "there are concurrent hypotheses on sub-shapes"
      elif status == HYP_BAD_SUBSHAPE :
          reason = "the shape is neither the main one, nor its sub-shape, nor a valid group"
@@@ -1183,12 -1183,11 +1183,12 @@@ omniORB.registerObjref(SMESH._objref_SM
  #    from salome.smesh import smeshBuilder
  #    smesh = smeshBuilder.New(salome.myStudy)
  #  \endcode
 -#  @param  study     SALOME study, generally obtained by salome.myStudy.
 -#  @param  instance  CORBA proxy of SMESH Engine. If None, the default Engine is used.
 +#  @param  study         SALOME study, generally obtained by salome.myStudy.
 +#  @param  instance      CORBA proxy of SMESH Engine. If None, the default Engine is used.
 +#  @param  instanceGeom  CORBA proxy of GEOM  Engine. If None, the default Engine is used.
  #  @return smeshBuilder instance
  
 -def New( study, instance=None):
 +def New( study, instance=None, instanceGeom=None):
      """
      Create a new smeshBuilder instance.The smeshBuilder class provides the Python
      interface to create or load meshes.
@@@ -1200,9 -1199,8 +1200,9 @@@
          smesh = smeshBuilder.New(salome.myStudy)
  
      Parameters:
 -        study     SALOME study, generally obtained by salome.myStudy.
 -        instance  CORBA proxy of SMESH Engine. If None, the default Engine is used.
 +        study         SALOME study, generally obtained by salome.myStudy.
 +        instance      CORBA proxy of SMESH Engine. If None, the default Engine is used.
 +        instanceGeom  CORBA proxy of GEOM  Engine. If None, the default Engine is used.
      Returns:
          smeshBuilder instance
      """
@@@ -1214,7 -1212,7 +1214,7 @@@
        doLcc = True
      smeshInst = smeshBuilder()
      assert isinstance(smeshInst,smeshBuilder), "Smesh engine class is %s but should be smeshBuilder.smeshBuilder. Import salome.smesh.smeshBuilder before creating the instance."%smeshInst.__class__
 -    smeshInst.init_smesh(study)
 +    smeshInst.init_smesh(study, instanceGeom)
      return smeshInst