Merge branch 'upstream' into tmp

* upstream:
  functions.m4 (ntpclient): Handle NTP servers with IPv6 addresses.
  local.m4: Allow IPv6 ping separately.
  telecaster.m4: External SMTP service for mailing lists.
  local.mk: Remove orange and mango.
  jem.m4, vampire.m4: Cull some external services.
  local.m4: gibson now uses explicit VLAN tagging.
  functions.m4: Only call `allow-non-init-frag' on fragments.

Conflicts:
	local.m4
	local.mk

diff --cc local.m4
Simple merge