ibr-cm/contiki-inga — pull request #33 by comawill (2014-11-08 12:36:12+00:00)
Title: Revert some changes made in merge d4e0d30

The reverted files were unnecessarily different to contiki/master and might cause merge conflicts in future merges.