Merged.

diff --cc errors/errno.fugu
Simple merge

diff --cc hake/ArchDefaults.hs
Simple merge

diff --cc hake/Config.hs.template
Simple merge

diff --cc hake/RuleDefs.hs
Simple merge

diff --cc hake/symbolic_targets.mk
index 96dd6b3,383d169..6a3f4ce
--- 1/hake/symbolic_targets.mk
--- 2/hake/symbolic_targets.mk
+++ b/hake/symbolic_targets.mk
@@@ -156,8 -161,7 +163,9 @@@ MODULES_x86_64= 
        sbin/bcached \
        sbin/testdesc \
        sbin/testdesc-child \
 +      sbin/angler \
 +      sbin/sshd \
+       sbin/lshw \
  
  # the following are broken in the newidc system
  MODULES_x86_64_broken= \

diff --cc if/Hakefile
Simple merge

diff --cc include/barrelfish/core_state.h
Simple merge

diff --cc kernel/arch/x86_64/syscall.c
Simple merge

diff --cc lib/barrelfish/Hakefile
Simple merge

diff --cc lib/barrelfish/debug.c
Simple merge

diff --cc lib/barrelfish/domain.c
Simple merge

diff --cc lib/barrelfish/init.c
Simple merge

diff --cc lib/octopus/client/getset.c
Simple merge

diff --cc lib/octopus/server/init.c
Simple merge

diff --cc lib/octopus/server/service.c
Simple merge

diff --cc usr/fish/fish.c
index 22c28aa,4d898f3..15d1952
--- 1/usr/fish/fish.c
--- 2/usr/fish/fish.c
+++ b/usr/fish/fish.c
@@@ -302,10 -295,10 +303,10 @@@ static int demo(int argc, char *argv[]
              while (rdtsc() - now < pixwidth) ;
          }
  
-         trace_event(TRACE_SUBSYS_BENCH, TRACE_EVENT_PCBENCH, 0);
+         trace_event(TRACE_SUBSYS_BENCH, TRACE_EVENT_BENCH_PCBENCH, 0);
          }
      }
 -    return 0;
 +    return EXIT_SUCCESS;
  }
  
  static int oncore(int argc, char *argv[])