merge

diff --cc errors/errno.fugu
index 9d6f75c,8859cad..108b96e
mode 100755,100644..100755
--- 1/errors/errno.fugu
--- 2/errors/errno.fugu
+++ b/errors/errno.fugu

diff --cc hake/symbolic_targets.mk
Simple merge

diff --cc usr/kaluga/driver_startup.c
index a9da911,08fe8c3..c4c2c5e
--- 1/usr/kaluga/driver_startup.c
--- 2/usr/kaluga/driver_startup.c
+++ b/usr/kaluga/driver_startup.c
@@@ -66,13 -99,12 +99,13 @@@ errval_t start_networking(coreid_t core
  
      // XXX: Manually add cardname (overwrite first (auto) argument)
      // +Weird convention, e1000n binary but cardname=e1000
-     char* cardname = strcmp(driver->binary, "e1000n") == 0 ?
-             "e1000" :  driver->binary;
+     char* cardname =
+             strcmp(driver->binary, "e1000n") == 0 ? "e1000" : driver->binary;
  
-     size_t name_len = strlen("cardname=")+strlen(cardname)+1;
+     size_t name_len = strlen("cardname=") + strlen(cardname) + 1;
      char* card_argument = malloc(name_len);
      sprintf(card_argument, "cardname=%s", cardname);
 +    printf("############# starting network with argiments %s\n", card_argument);
  
      // Spawn netd and ngd_mng
      netd->argv[0] = card_argument;