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

diff --combined sfa/managers/aggregate_manager.py
index 84dc0dd,b4f109f..7646dd3
--- 1/sfa/managers/aggregate_manager.py
--- 2/sfa/managers/aggregate_manager.py
+++ b/sfa/managers/aggregate_manager.py
@@@ -8,11 -8,10 +8,10 @@@ from types import StringType
  from sfa.util.faults import *
  from sfa.util.xrn import get_authority, hrn_to_urn, urn_to_hrn, Xrn, urn_to_sliver_id
  from sfa.util.plxrn import slicename_to_hrn, hrn_to_pl_slicename, hostname_to_urn
- from sfa.util.specdict import *
  from sfa.util.record import SfaRecord
  from sfa.util.policy import Policy
  from sfa.util.record import *
 -from sfa.util.sfaticket import SfaTicket
 +from sfa.trust.sfaticket import SfaTicket
  from sfa.plc.slices import Slices
  from sfa.trust.credential import Credential
  import sfa.plc.peers as peers

diff --combined sfa/managers/aggregate_manager_vini.py
index bcb2729,3b92eeb..88c4438
--- 1/sfa/managers/aggregate_manager_vini.py
--- 2/sfa/managers/aggregate_manager_vini.py
+++ b/sfa/managers/aggregate_manager_vini.py
@@@ -6,12 -6,11 +6,11 @@@ import sy
  from types import StringTypes
  from sfa.util.xrn import urn_to_hrn, Xrn
  from sfa.util.plxrn import hrn_to_pl_slicename
- from sfa.util.specdict import *
  from sfa.util.faults import *
  from sfa.util.record import SfaRecord
  from sfa.util.policy import Policy
  from sfa.util.record import *
 -from sfa.util.sfaticket import SfaTicket
 +from sfa.trust.sfaticket import SfaTicket
  from sfa.server.registry import Registries
  from sfa.plc.slices import Slices
  import sfa.plc.peers as peers

diff --combined sfa/managers/slice_manager.py
index 18cc6aa,3eda3db..d3ce06b
--- 1/sfa/managers/slice_manager.py
--- 2/sfa/managers/slice_manager.py
+++ b/sfa/managers/slice_manager.py
@@@ -1,4 -1,4 +1,4 @@@
- #
+ /
  import sys
  import time,datetime
  from StringIO import StringIO
@@@ -11,7 -11,6 +11,6 @@@ from sfa.util.sfalogging import logge
  from sfa.util.rspecHelper import merge_rspecs
  from sfa.util.xrn import Xrn, urn_to_hrn, hrn_to_urn
  from sfa.util.plxrn import hrn_to_pl_slicename
- from sfa.util.specdict import *
  from sfa.util.faults import *
  from sfa.util.record import SfaRecord
  from sfa.rspecs.rspec_converter import RSpecConverter
@@@ -20,7 -19,7 +19,7 @@@ from sfa.rspecs.version_manager import 
  from sfa.rspecs.rspec import RSpec 
  from sfa.util.policy import Policy
  from sfa.util.prefixTree import prefixTree
 -from sfa.util.sfaticket import *
 +from sfa.trust.sfaticket import SfaTicket
  from sfa.trust.credential import Credential
  from sfa.util.threadmanager import ThreadManager
  import sfa.util.xmlrpcprotocol as xmlrpcprotocol