Merge branch 'xseg-refactor' into debian

diff --combined xseg/tools/vlmc
index f049170,2ffb173..e15ca47
--- 1/xseg/tools/vlmc
--- 2/xseg/tools/vlmc
+++ b/xseg/tools/vlmc
@@@ -19,13 -19,14 +19,13 @@@ def vlmc_create(args)
      else:
          size = 0
  
 -    cmd = [XSEG_HOME + "/peers/user/vlmc-xseg", "%s" % SPEC, "create", "--name", "%s" % name]
 +    cmd = ["vlmc-xseg", "%s" % SPEC, "create", "--name", "%s" % name]
      if snap != None:
              cmd.extend(["--snap", "%s" % snap])
      if size != None:
              cmd.extend(["--size", "%s" % size])
      cmd.extend(["-mp", "%s" % MPORT])
      cmd.extend(["-p", "%s" % VTOOL])
 -    os.environ['LD_LIBRARY_PATH'] = XSEG_HOME + "/lib:" + XSEG_HOME + "/lib/user"
  
      try:
          check_call(cmd, shell=False, env=os.environ);
@@@ -44,9 -45,10 +44,9 @@@ def vlmc_list(args)
  
  def vlmc_remove(args):
      name = args.name[0]
 -    cmd = [XSEG_HOME + "/peers/user/vlmc-xseg", "%s" % SPEC, "remove", "--name", "%s" % name]
 +    cmd = ["vlmc-xseg", "%s" % SPEC, "remove", "--name", "%s" % name]
      cmd.extend(["-mp", "%s" % MPORT])
      cmd.extend(["-p", "%s" % VTOOL])
 -    os.environ['LD_LIBRARY_PATH'] = XSEG_HOME + "/lib:" + XSEG_HOME + "/lib/user"
  
      try:
          check_call(cmd, shell=False, env=os.environ);
@@@ -165,7 -167,7 +165,7 @@@ def loadrc(rc)
      #FIXME
      try:
          if rc == None:
-             execfile(os.path.expanduser("/etc/defaut/archipelago"), globals())
+             execfile(os.path.expanduser("/etc/default/archipelago"), globals())
          else:
              execfile(rc, globals())
      except: