Merge commit to recover branch reachability for ns-3.32 tag

This merge commit recovers branch history to commits c147ce8 and 70ff1f9
which became unreachable with the previous branch merge for some reason.

CHANGES.html

@@ -50,6 +50,25 @@ the cracks, unfortunately.  If you, as a user, can suggest improvements
 to this file based on your experience, please contribute a patch or drop
 us a note on ns-developers mailing list.</p>
 
+<hr>
+<h1>Changes from ns-3.32 to ns-3.33</h1>
+<h2>New API:</h2>
+<ul>
+<li></li>
+</ul>
+<h2>Changes to existing API:</h2>
+<ul>
+<li></li>
+</ul>
+<h2>Changes to build system:</h2>
+<ul>
+<li></li>
+</ul>
+<h2>Changed behavior:</h2>
+<ul>
+<li></li>
+</ul>
+
 <hr>
 <h1>Changes from ns-3.31 to ns-3.32</h1>
 <h2>New API:</h2>

RELEASE_NOTES

@@ -9,6 +9,16 @@ http://www.nsnam.org including tutorials: http://www.nsnam.org/tutorials.html
 Consult the file CHANGES.html for more detailed information about changed
 API and behavior across ns-3 releases.
 
+Release 3-dev
+=============
+
+New user-visible features
+-------------------------
+
+Bugs fixed
+----------
+
+
 Release 3.32
 ============
 

bindings/python/wscript

@@ -14,8 +14,14 @@ from waflib.Errors import WafError
 # after = TaskGen.after
 
 # https://github.com/gjcarneiro/pybindgen
-REQUIRED_PYBINDGEN_VERSION = '0.21.0'
-REQUIRED_PYGCCXML_VERSION = (1, 9, 1)
+# If specifying a released pybindgen version, specify the required PYBINDGEN
+# version as, e.g. '0.21.0'
+# If specifying a commit on the development tree, specify it like this based
+# on 'git describe --tags' command.  Example, if the latest release was 0.21.0,
+# and 'git decribe --tags' reports "0.21.0-6-g8e7c0a9", then write the
+# PYBINDGEN version string below as '0.21.0.post6+ng8e7c0a9'
+REQUIRED_PYBINDGEN_VERSION = '0.21.0.post6+ng8e7c0a9'
+REQUIRED_PYGCCXML_VERSION = (2, 0, 1)
 REQUIRED_CASTXML_VERSION = '0.2'
 
 RUN_ME=-3
@@ -200,7 +206,7 @@ def configure(conf):
             Logs.warn("pybindgen (found %r), (need %r)" %
                       (pybindgen_version, REQUIRED_PYBINDGEN_VERSION))
             conf.report_optional_feature("python", "Python Bindings", False,
-                                         "PyBindGen version not correct and newer version could not be retrieved")
+                                         "PyBindGen found but version %s is not the required version %s" % (pybindgen_version, REQUIRED_PYBINDGEN_VERSION))
             return