merge 2.7.4 release branch

Misc/NEWS

 Python News
 +++++++++++
 
+What's New in Python 2.7.4?
+===========================
+
+*Release date: XXXX-XX-XX*
+
+Library
+-------
+
+- Issue #17531: Return group and user ids as int instead long when possible.
+
+
 What's New in Python 2.7.4 release candidate 1
 ==============================================
 

Modules/posixmodule.c

@@ -357,7 +357,7 @@ _PyInt_FromUid(uid_t uid)
 {
     if (uid <= LONG_MAX)
         return PyInt_FromLong(uid);
-    return PyLong_FromUnsignedLong(uid);
+    return PyInt_FromUnsignedLong(uid);
 }
 
 PyObject *
@@ -365,7 +365,7 @@ _PyInt_FromGid(gid_t gid)
 {
     if (gid <= LONG_MAX)
         return PyInt_FromLong(gid);
-    return PyLong_FromUnsignedLong(gid);
+    return PyInt_FromUnsignedLong(gid);
 }
 
 int