Merge branch 'master' into senslab2

Conflicts:
	setup.py

diff --cc setup.py
index eafced4,a0c222a..96cb8cb
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -32,12 -30,6 +30,15 @@@ packages = 
      'sfa/generic',
      'sfa/managers',
      'sfa/importer',
-     'sfa/planetlab',
 +
 +
++
 +    'sfa/senslab',
 +
++
++
++
 +
      'sfa/rspecs',
      'sfa/rspecs/elements',
      'sfa/rspecs/elements/versions',

diff --cc sfa/client/sfi.py
Simple merge

diff --cc sfa/planetlab/plslices.py
Simple merge

diff --cc sfa/util/xrn.py
index 60b57b9,083e620..19b1fc1
--- 1/sfa/util/xrn.py
--- 2/sfa/util/xrn.py
+++ b/sfa/util/xrn.py
@@@ -116,9 -121,8 +121,9 @@@ class Xrn
      # provide either urn, or (hrn + type)
      def __init__ (self, xrn, type=None):
          if not xrn: xrn = ""
 +       
          # user has specified xrn : guess if urn or hrn
-         if xrn.startswith(Xrn.URN_PREFIX):
+         if Xrn.is_urn(xrn):
              self.hrn=None
              self.urn=xrn
              self.urn_to_hrn()