Merge branch 'lwip_dev' of /home/palacios/palacios into lwip_dev

Conflicts:
	palacios/src/lwip/arch/sys_arch.c

diff --cc palacios/build/Makefile
Simple merge

diff --cc palacios/src/lwip/arch/sys_arch.c
index d5fa76d,289ed70..e390d98
--- 1/palacios/src/lwip/arch/sys_arch.c
--- 2/palacios/src/lwip/arch/sys_arch.c
+++ b/palacios/src/lwip/arch/sys_arch.c
@@@ -188,7 -188,7 +188,6 @@@ current_thread(void
  }
  
  
--//!!!!!!!!!!!!backto this function later
  /*-----------------------------------------------------------------------------------*/
  sys_thread_t
  sys_thread_new(char *name, void (* function)(void *arg), void *arg, int stacksize, int prio)