Telnetd improvement: allow specifying a maximum silence time and kill the connection after that time. This is to avoid the telnet connection getting stuck forever if the connecting host reboots.
Added a number of default options for ContikiMAC, and allow them to be overridden with contiki-conf.h configuration options
Allow proactive probing interval to be configured
Allow platform makefiles to specify APPS to be used, by defining a PLATFORMAPPS variable.
Bugfix: when a CSMA callback is received, we should remove the packet
that was transmitted and not just the first packet that happens to be on
the output queue.
examples/trickle-library: correct probability expression

Documented intent is to update with probability 1/NEW_TOKEN_PROB where
NEW_TOKEN_PROB is 0x80.  The current implementation updates with probability
1/2.  Update NEW_TOKEN_PROB and the expression to keep existing behavior
while correcting the calculation.

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
Removed some more old RCS tags from the Contiki source tree.
Merge pull request #273 from oliverschmidt/master

Removed some more old RCS tags from the Contiki source tree.
Made use of Atari XL shadow RAM.

The new Atari XL target allows cc65 programs to make use of
the shadow RAM. This allows to turn aon all features of the
web browser - and will allow for additional improvements to
come :-)
Merge pull request #274 from oliverschmidt/master

Made use of Atari XL shadow RAM.
Merge pull request #270 from pabigot/push/trickle-example

examples/trickle-library: correct probability expression
Merge pull request #177 from adamdunkels/feature-config-improvements

Configurability updates
Temporarily disable large RPL network test until we get link-layer ACKs in Cooja
Merge pull request #257 from adamdunkels/hotfix-csma

CSMA bugfix
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Makefile.include

Conflict in context only, not overlapping actual code.