Merge branch 'master' of git.onelab.eu:/git/sfa

Conflicts:
	sfa/client/sfi.py

diff --cc sfa/client/sfi.py
index 3d9c0f1,e2b3793..d25c172
--- 1/sfa/client/sfi.py
--- 2/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@@ -309,10 -314,10 +314,10 @@@ class Sfi
         self.cert_file = cert_file
         self.cert = Certificate(filename=cert_file) 
         # Establish connection to server(s)
-        if self.options.verbose : print "Contacting Registry at:", reg_url
+        self.logger.info("Contacting Registry at: %s"%reg_url)
 -       self.registry = xmlrpcprotocol.get_server(reg_url, key_file, cert_file, self.options.debug)  
 +       self.registry = xmlrpcprotocol.get_server(reg_url, key_file, cert_file, self.options)  
-        if self.options.verbose : print "Contacting Slice Manager at:", sm_url
+        self.logger.info("Contacting Slice Manager at: %s"%sm_url)
 -       self.slicemgr = xmlrpcprotocol.get_server(sm_url, key_file, cert_file, self.options.debug)
 +       self.slicemgr = xmlrpcprotocol.get_server(sm_url, key_file, cert_file, self.options)
  
         return