DS249 and Nested Hubs
Merge branch 'master' of https://github.com/desto-kluger/digitemp

Conflicts:
	ChangeLog
	Makefile
	README
	perl/check_digitemp.pl
	perl/digitemp_mysql.pl
	perl/inc_temp
	perl/maxplot
	perl/rem_temp
	python/gui/digitemp_gui.py
	python/gui/dtgraph.py
	python/gui/dttest.py
	python/gui/test_graph.py
	python/mysql/home_weather.py
	python/mysql/make_rain_rrd
	python/mysql/make_sensor_rrd
	python/mysql/make_wind_rrd
	rrdb/log-temperature.pl
	rrdb/log_temp
	rrdb/make_temps
	rrdb/temp-all.cgi
	rrdb/temp-minmax.cgi
	rrdb/temp-one.cgi
	src/device_name.c
	src/digitemp.c
	src/digitemp.h
	userial/ad26.c
	userial/ds2490/ownet.c
	userial/ds2490/usblnk.c
	userial/ds2490/usbses.c
	userial/ioutil.c
	userial/swt1f.c