Merged from trunk 6320:6325
authorFabian Groffen <grobian@gentoo.org>
Sat, 31 Mar 2007 11:15:41 +0000 (11:15 -0000)
committerFabian Groffen <grobian@gentoo.org>
Sat, 31 Mar 2007 11:15:41 +0000 (11:15 -0000)
commit70ebcaef746c2d05174b3e7d935eafc0fe3e32a0
tree401915458299c7868f17297ca6dbaaf51bd8feaa
parent06102b216e1306bad8c38e9cd32fbf6a49a06db1
   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
man/ebuild.5
pym/emerge/__init__.py
pym/portage/__init__.py