Merge from V6_main 13/12/2012

diff --git a/src/PYCALCULATOR/PYCALCULATOR.py b/src/PYCALCULATOR/PYCALCULATOR.py
index 06c530d35ce2c83f6817be8df03357253bffee74..50e6373373599c399ec6f99929e52daf49ba15af 100755 (executable)
--- a/src/PYCALCULATOR/PYCALCULATOR.py
+++ b/src/PYCALCULATOR/PYCALCULATOR.py
@@ -46,6 +46,10 @@ class PYCALCULATOR (PYCALCULATOR_ORB__POA.PYCALCULATOR_Gen, SALOME_ComponentPy.S
        self._naming_service=SALOME_ComponentPy.SALOME_NamingServicePy_i(self._orb)
         print "End of PYCALCULATOR::__init__" 
 
+    def getVersion( self ):
+        import salome_version
+        return salome_version.getVersion("PYCALCULATOR", True)
+
     def Add(self, field1, field2):
         print "Begin of PYCALCULATOR::Add"
         print "pointeur on first argument : ",field1