Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki

Makefile.include

apps/servreg-hack/servreg-hack.c

apps/servreg-hack/servreg-hack.h

apps/shell/shell-ps.c

apps/webserver-nano/Makefile.webserver-nano

apps/webserver-nano/httpd-cgi.c

apps/webserver-nano/httpd.h

apps/webserver-nano/webserver-nogui.c

core/contiki-net.h

core/net/mac/contikimac.c

core/net/mac/contikimac.h

core/net/sicslowpan.c

core/net/simple-udp.c

core/net/simple-udp.h

core/net/uip-udp-packet.c

core/net/uip6.c

cpu/avr/Makefile.avr

cpu/avr/dev/clock.c

cpu/avr/radio/rf230bb/rf230bb.c

cpu/avr/radio/rf230bb/rf230bb.h