Merge from 3.3.

Stefan Krah · Stefan Krah · commit 34e4628453a0 · 2014-01-20T15:35:38.000+01:00
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -562,6 +562,7 @@ Randall Hopper
 Nadav Horesh
 Alon Horev
 Jan Hosang
+Alan Hourihane
 Ken Howard
 Brad Howes
 Mike Hoy
diff --git a/Python/fileutils.c b/Python/fileutils.c
@@ -1,11 +1,12 @@
 #include "Python.h"
 #include "osdefs.h"
+#include <locale.h>
+
 #ifdef MS_WINDOWS
 #  include <windows.h>
 #endif
 
 #ifdef HAVE_LANGINFO_H
-#include <locale.h>
 #include <langinfo.h>
 #endif
 
