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

Conflicts:
	sfa/util/config.py

diff --cc sfa/client/sfi.py
index 28fe3ff,f89c5e0..ae4d97a
--- 1/sfa/client/sfi.py
--- 2/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@@ -25,15 -26,10 +25,16 @@@ from sfa.util.xrn import get_leaf, get_
  from sfa.util.config import Config
  from sfa.util.version import version_core
  from sfa.util.cache import Cache
 +from sfa.util.record import SfaRecord, UserRecord, SliceRecord, NodeRecord, AuthorityRecord
 +
 +from sfa.rspecs.rspec import RSpec
 +from sfa.rspecs.rspec_converter import RSpecConverter
  from sfa.rspecs.version_manager import VersionManager
+ from sfa.client.return_value import ReturnValue
  
 +import sfa.client.xmlrpcprotocol as xmlrpcprotocol
 +from sfa.client.client_helper import pg_users_arg, sfa_users_arg
 +
  AGGREGATE_PORT=12346
  CM_PORT=12346