Merge branch 'master' of newgeom:newgeom

author nds <natalia.donis@opencascade.com>

Thu, 22 May 2014 10:50:58 +0000 (14:50 +0400)

committer nds <natalia.donis@opencascade.com>

Thu, 22 May 2014 10:50:58 +0000 (14:50 +0400)
author nds <natalia.donis@opencascade.com>
Thu, 22 May 2014 10:50:58 +0000 (14:50 +0400)
committer nds <natalia.donis@opencascade.com>
Thu, 22 May 2014 10:50:58 +0000 (14:50 +0400)
diff --cc src/PartSet/PartSet_OperationSketchBase.cpp
Simple merge
author	nds <natalia.donis@opencascade.com>
	Thu, 22 May 2014 10:50:58 +0000 (14:50 +0400)
committer	nds <natalia.donis@opencascade.com>
	Thu, 22 May 2014 10:50:58 +0000 (14:50 +0400)