Merge branch 'master' into xbee3

Conflicts:
	html/man3/xbee_conNew.3.html
	html/man3/xbee_setup.3.html
	make/default/arm920t.mk
	make/default/freebsd.mk
	make/default/linux.mk
	make/libconfig.mk
	man/man3/xbee_conNew.3
	man/man3/xbee_setup.3
	mode.h