Merged revisions 81419 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81419 | georg.brandl | 2010-05-21 22:58:12 +0200 (Fr, 21 Mai 2010) | 1 line

  Add missing parameter in SimpleXMLRPCServer signature.
........

Doc/library/simplexmlrpcserver.rst

@@ -20,7 +20,7 @@ XML-RPC servers written in Python.  Servers can either be free standing, using
 :class:`CGIXMLRPCRequestHandler`.
 
 
-.. class:: SimpleXMLRPCServer(addr[, requestHandler[, logRequests[, allow_none[, encoding]]]])
+.. class:: SimpleXMLRPCServer(addr[, requestHandler[, logRequests[, allow_none[, encoding[, bind_and_activate]]]])
 
    Create a new server instance.  This class provides methods for registration of
    functions that can be called by the XML-RPC protocol.  The *requestHandler*