Merge remote branch 'origin/V7_dev'

author vsr <vsr@opencascade.com>

Tue, 24 May 2016 15:05:17 +0000 (18:05 +0300)

committer vsr <vsr@opencascade.com>

Tue, 24 May 2016 15:05:17 +0000 (18:05 +0300)
author vsr <vsr@opencascade.com>
Tue, 24 May 2016 15:05:17 +0000 (18:05 +0300)
committer vsr <vsr@opencascade.com>
Tue, 24 May 2016 15:05:17 +0000 (18:05 +0300)
diff --cc src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
Simple merge
author	vsr <vsr@opencascade.com>
	Tue, 24 May 2016 15:05:17 +0000 (18:05 +0300)
committer	vsr <vsr@opencascade.com>
	Tue, 24 May 2016 15:05:17 +0000 (18:05 +0300)