merge master

diff --cc commands/package.py
index 09fef8f8f552f94a563498f3fc6b9c1d1d3f5598,5d1ade46be5c04fa7499093f26e4ce7dd0a766a0..1a16253d2bebb71b5e8cd0620be1c31081bcacf2
--- 1/commands/package.py
--- 2/commands/package.py
+++ b/commands/package.py
@@@ -1349,7 -1337,7 +1349,6 @@@ Please add it in file
          if options.sat:
              d_files_to_add.update({"salomeTools" : (runner.cfg.VARS.salometoolsway, "")})
          
-     
 -
      if options.project:
          DBG.write("config for package %s" % project_name, runner.cfg)
          d_files_to_add.update(project_package(runner.cfg, project_name, options.project_file_path, tmp_working_dir, logger))