Merge branch 'V5-4-patches' into V5-7-patches
Conflicts:
agent/mibgroup/mibII.h
diff --git a/agent/mibgroup/mibII.h b/agent/mibgroup/mibII.h
index e5de425..35cb544 100644
--- a/agent/mibgroup/mibII.h
+++ b/agent/mibgroup/mibII.h
@@ -7,7 +7,6 @@
config_version_require((mibII/snmp_mib, 5.5, mibII/snmp_mib_5_5))
config_require(mibII/vacm_vars)
config_require(mibII/setSerialNo)
-config_require(mibII/setSerialNo)
#if !defined(cygwin) || defined(HAVE_IPHLPAPI_H)
config_require(mibII/at)
config_require(mibII/ifTable)
diff --git a/dist/release b/dist/release
index 6da7b93..8a8314c 100644
--- a/dist/release
+++ b/dist/release
@@ -3,6 +3,3 @@
# applying patches to a given branch. Right now, the file should contain
# a branch name followed by 'rc' when the branch is in rc phase of a release.
#
-V5-7-patches rc
-V5-7-patches rc
-V5-7-patches rc
