BIND 10 master, updated. 90f4e987cf3477a8ecc361399e268175be3a5ce8 Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  90f4e987cf3477a8ecc361399e268175be3a5ce8 (commit)
       via  c5b51bb8881dd5c7950143033d507f27b1fc4422 (commit)
      from  235a2af717e4eed8599d5b4051d1b62e27888a4b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 90f4e987cf3477a8ecc361399e268175be3a5ce8
Merge: c5b51bb 235a2af
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu Dec 22 10:04:22 2011 -0800

    Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

commit c5b51bb8881dd5c7950143033d507f27b1fc4422
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu Dec 22 10:03:46 2011 -0800

    [master] applied workaround for build error with macos+clang+static link.

-----------------------------------------------------------------------

Summary of changes:
 .../isc/util/io/socketsessionforwarder_python.cc   |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/util/io/socketsessionforwarder_python.cc b/src/lib/python/isc/util/io/socketsessionforwarder_python.cc
index ab88e06..bdc2bf7 100644
--- a/src/lib/python/isc/util/io/socketsessionforwarder_python.cc
+++ b/src/lib/python/isc/util/io/socketsessionforwarder_python.cc
@@ -52,6 +52,17 @@ s_SocketSessionForwarder::s_SocketSessionForwarder() : cppobj(NULL) {
 // Import pydoc text
 #include "socketsessionforwarder_inc.cc"
 
+// See python/isc/log/log.cc for the use of namespace
+namespace clang_unnamed_namespace_workaround {
+// Internal exception class thrown when address parsing fails
+class AddressParseError: public isc::Exception {
+public:
+    AddressParseError(const char *file, size_t line, const char *what):
+        isc::Exception(file, line, what) {}
+};
+}
+using namespace clang_unnamed_namespace_workaround;
+
 namespace {
 
 int
@@ -87,13 +98,6 @@ SocketSessionForwarder_destroy(PyObject* po_self) {
     Py_TYPE(self)->tp_free(self);
 }
 
-// Internal exception class thrown when address parsing fails
-class AddressParseError: public isc::Exception {
-public:
-    AddressParseError(const char *file, size_t line, const char *what):
-        isc::Exception(file, line, what) {}
-};
-
 // Convert a Python socket address object to an addrinfo structure by
 // getaddrinfo.
 void