CHANGES: snmpd: Added btrfs support to hrFSTable
Merge branch 'V5-5-patches' into V5-6-patches

* V5-5-patches:
  CHANGES: snmpd: Added btrfs support to hrFSTable
CHANGES: documentation: from "Eric S. Raymond": Correct man page markup problem
Ambiguous or invalid backslash.  This doesn't cause groff a problem.
but it confuses doclifter and may confuse older troff implementations.
Merge branch 'V5-4-patches' into V5-5-patches

* V5-4-patches:
  CHANGES: documentation: from "Eric S. Raymond": Correct man page markup problem Ambiguous or invalid backslash.  This doesn't cause groff a problem. but it confuses doclifter and may confuse older troff implementations.
Merge branch 'V5-5-patches' into V5-6-patches

* V5-5-patches:
  CHANGES: documentation: from "Eric S. Raymond": Correct man page markup problem Ambiguous or invalid backslash.  This doesn't cause groff a problem. but it confuses doclifter and may confuse older troff implementations.
Merge branch 'V5-6-patches' of ssh://git.code.sf.net/p/net-snmp/code into V5-6-patches
CHANGES: snmpd: show Linux kernel threads in hrSWRunTable.
CHANGES: python: Fixed returning of empty strings.

Varbind type (SNMP_NOSUCHOBJECT etc.) should be used to detect errors instead of length of the variable - it can be empty string.
Merge branch 'V5-5-patches' into V5-6-patches

* V5-5-patches:
  CHANGES: python: Fixed returning of empty strings.

Conflicts:
	python/netsnmp/client_intf.c
CHANGES: python: correctly report error when parsing malformed OID.
Merge branch 'V5-5-patches' into V5-6-patches

* V5-5-patches:
  CHANGES: python: correctly report error when parsing malformed OID.
BUG a#2463: Fix configure to respect data from mysql_config.
Merge branch 'V5-5-patches' into V5-6-patches

* V5-5-patches:
  BUG a#2463: Fix configure to respect data from mysql_config.
CHANGES: BUG: 2470: Accept 65535 as a valid IPv6 port number
Update configuration documentation with includeFile and includeDir.
includeDir is not predictable with relative paths
CHANGES: snmpd: PATCH 2472: from Sunil: don't use HBKT as heartbeat interval in SCTP-MIB::sctpAssocTable.
Merge branch 'V5-5-patches' into V5-6-patches

* V5-5-patches:
  CHANGES: snmpd: PATCH 2472: from Sunil: don't use HBKT as heartbeat interval in SCTP-MIB::sctpAssocTable.
Only check for mysql/mysql.h once. Remove HAVE_MYSQL_MYSQL_H since nothing uses it.
Use the output of mysql_config --include instread of the output of mysql_config --cflags ito find include files.

According to the mysql_config man page, --include is recommended for greater
portability since --cflags might contain compiler flags for the compiler that
was used to build libmysqlclient which might clash with the ones used to
build the application.