Merge commit 'origin/master'

diff --combined sfa/plc/network.py
index d0e0e08,71f0bd1..c84ffa5
--- 1/sfa/plc/network.py
--- 2/sfa/plc/network.py
+++ b/sfa/plc/network.py
@@@ -1,15 -1,13 +1,15 @@@
  from __future__ import with_statement
 +import sys
  import re
  import socket
 +from StringIO import StringIO
 +from lxml import etree
 +from xmlbuilder import XMLBuilder
 +
 +from sfa.util.faults import *
 +#from sfa.util.sfalogging import sfa_logger
  from sfa.util.xrn import get_authority
  from sfa.util.plxrn import hrn_to_pl_slicename, hostname_to_urn
 -from sfa.util.faults import *
 -from xmlbuilder import XMLBuilder
 -from lxml import etree
 -import sys
 -from StringIO import StringIO
  
  class Sliver:
      def __init__(self, node):
@@@ -570,10 -568,8 +570,8 @@@ class Network
          tmp = []
          for node in api.plshell.GetNodes(api.plauth, {'peer_id': None}):
              try:
-                 nodeObj = Node(self, node)
-                 if nodeObj.site != None:
-                     t = node['node_id'], nodeObj
-                     tmp.append(t)
+                 t = node['node_id'], Node(self, node)
+                 tmp.append(t)
              except:
                  self.api.logger.error("Failed to add node %s (%s) to RSpec" % (node['hostname'], node['node_id']))