Bumped the version number from 2.6 to 3.x, which is to be used in the development branch
Moved #defines so that UIP_TCPIP_HLEN and UIP_LLH_LEN are defined before they are used
Make 0 the default link-layer header length, as far as uIP is concerned. Most currently used linke layers (specifically, 802.15.4) has adaptation layers that use separate buffers, so there is no need to reserve space in the uIP buffer.
Removed redundant #ifdef
Fixed a severe error in the bugfix: the conditional was reversed. The check must be if the TCP MSS is larger than the BUFSIZE and not the other way around.
Merge pull request #501 from oliverschmidt/master

Have CBM DOS filetype of imported files match the one used by cc65.
Merge pull request #498 from adamdunkels/push/contiki-3.x

Bump the version number in the development branch
Merge pull request #502 from adamdunkels/push/fix-the-ipv6-bugfix

Fix the IPv6 bugfix
Merge pull request #509 from oliverschmidt/master

Now that all supported targets echo the Return key on gets() there's no more need to print \n's.