From: Cédric Aguerre <cedric.aguerre@edf.fr>
Date: Wed, 4 Mar 2015 13:16:56 +0000 (+0100)
Subject: fix merge conflicts
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=862dc8f223060029ccd77da629137310167cbb4d;p=modules%2Fkernel.git

fix merge conflicts
---

862dc8f223060029ccd77da629137310167cbb4d