Initial merge of my mods to add manual_routed and manual_tagged IPTV modes.
Ignore junk created by OS X.
Merge remote-tracking branch 'origin/master' into vahur
Fixed extra LF character at the end of the short host name.
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of git://github.com/RMerl/asuswrt-merlin
Merge branch 'master' of github.com:vahur/asuswrt-merlin into iptv
NUT 2.6.5 added.
Added NUT to build config.
Merge branch 'master' into nut

Conflicts:
	release/src-rt/target.mak
	release/src/router/config/config.in
Merge branch 'master' into iptv
Fixed NUT version number.
Merge branch 'master' into iptv
Merge branch 'master' into nut
Merge branch 'master' into iptv
Merge branch 'master' into nut

Conflicts:
	release/src-rt/target.mak
Merge branch 'master' into iptv
Merge branch 'master' into nut
Revert these to versions from master.
Merge branch 'master' into iptv

Conflicts:
	release/src/router/rc/interface.c
	release/src/router/www/Advanced_IPTV_Content.asp