[master] Merge branch 'rt25901_atf'

Conflicts:
	configure

diff --cc configure.ac
Simple merge

diff --cc includes/config.h.in
Simple merge

diff --cc server/dhcpd.c
Simple merge

diff --cc server/mdb6.c
Simple merge