[MERGE] merge the changes from main trunk branch.

bzr revid: vra@tinyerp.com-20100624084539-ne1e1tscqn1z3jw5
bzr revid: vra@tinyerp.com-20100624084650-svala4jb0dnf7aal

1 files changed, 5 insertions, 0 deletions

diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index 9b246e5bb5f..5f69a5bdcea 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -1160,6 +1160,11 @@ def extract_zip_file(zip_file, outdirectory):
     zf.close()
 
 def detect_ip_addr():
+    """Try a very crude method to figure out a valid external
+       IP or hostname for the current machine. Don't rely on this
+       for binding to an interface, but it could be used as basis
+       for constructing a remote URL to the server.
+    """
     def _detect_ip_addr():
         from array import array
         import socket