Issue #17557: merge from 3.3

diff --cc Misc/ACKS
index 2e38ee3dea7b8f8e6438496f37b933f060451dc3,54fa661fbe9aed983a000dff0a7101c5746e4a37..16167ae0a64c56168b2bec9d30459ecaf6cc194d
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -737,9 -721,9 +737,10 @@@ Petri Lehtine
  Luke Kenneth Casson Leighton
  Tshepang Lekhonkhobe
  Marc-André Lemburg
+ Mateusz Lenik
  John Lenton
  Kostyantyn Leschenko
 +Benno Leslie
  Christopher Tur Lesniewski-Laas
  Alain Leufroy
  Mark Levinson

diff --cc Misc/NEWS
index 04bce96a89c6d0092a2655e96b6130902c63fd7d,f0cbca20e7b300adc20e30a8286dc2e587f534fc..bc6a810fb1e6f4555179a5184232ffa3605864a3
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -184,18 -59,9 +184,21 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #17557: Fix os.getgroups() to work with the modified behavior of
+   getgroups(2) on OS X 10.8.  Original patch by Mateusz Lenik.
+ 
 +- Issue #18608: Avoid keeping a strong reference to the locale module
 +  inside the _io module.
 +
 +- Issue #18619: Fix atexit leaking callbacks registered from sub-interpreters,
 +  and make it GC-aware.
 +
 +- Issue #15699: The readline module now uses PEP 3121-style module
 +  initialization, so as to reclaim allocated resources (Python callbacks)
 +  at shutdown.  Original patch by Robin Schreiber.
 +
 +- Issue #17616: wave.open now supports the context manager protocol.
 +
  - Issue #18599: Fix name attribute of _sha1.sha1() object. It now returns
    'SHA1' instead of 'SHA'.
  

diff --cc Modules/posixmodule.c
Simple merge