setMiltitime() was declared
setMultitime() was impelemnted
Merge branch 'master' of https://github.com/start-x/startx-src

Conflicts:
	device/msp430dev/launchpad.h