contiki-os/contiki — pull request #342 by zwuh (2013-08-28 10:38:53+00:00)
Title: Improved Trickle library and fixed a typo in uipopt.h

1. Fixed a typo in the comments of uipopt.h
2. Added a missing '&' in trickle-library.h
3. Allow callback functions to disable the corresponding Trickle timer.