Merge branch 'master' into V7_5_BR

author vsr <vsr@opencascade.com>

Mon, 12 Jan 2015 10:24:59 +0000 (13:24 +0300)

committer vsr <vsr@opencascade.com>

Mon, 12 Jan 2015 10:24:59 +0000 (13:24 +0300)
author vsr <vsr@opencascade.com>
Mon, 12 Jan 2015 10:24:59 +0000 (13:24 +0300)
committer vsr <vsr@opencascade.com>
Mon, 12 Jan 2015 10:24:59 +0000 (13:24 +0300)
diff --cc src/SMESH/SMESH_MeshEditor.cxx
Simple merge
author	vsr <vsr@opencascade.com>
	Mon, 12 Jan 2015 10:24:59 +0000 (13:24 +0300)
committer	vsr <vsr@opencascade.com>
	Mon, 12 Jan 2015 10:24:59 +0000 (13:24 +0300)