Merged from trunk 6320:6325
+------------------------------------------------------------------------+
| 6321 | For bug #172571, use socket.AF_INET as the default family |
| zmedico | for socket.getaddrinfo(). |
|----------+-------------------------------------------------------------|
| 6324 | make PDEPEND wording less restrictive #172511 and clarify |
| SpankMan | install status wrt ||() as noted by ferringb |
|----------+-------------------------------------------------------------|
| 6325 | Fix missing import. |
| zmedico | |
+------------------------------------------------------------------------+
svn path=/main/branches/prefix/; revision=6327