Backporting once again from the trunk.

I18ners please double check (except Tokio).  It's always so painful to
resolve conflicts here, I hope I got them right.

1 files changed, 4 insertions, 3 deletions

diff --git a/configure b/configure
index 0b6575d5..841494e4 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 2.39 
+# From configure.in Revision: 2.39.2.1 
 
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13 
@@ -668,9 +668,9 @@ except ImportError:
     res = "no"
 else:
     try:
-	distutils.sysconfig.get_config_vars()
+        distutils.sysconfig.get_config_vars()
     except distutils.errors.DistutilsPlatformError:
-	res = "no"
+        res = "no"
     else:
         res = "yes"
 fp = open("conftest.out", "w")
@@ -2086,6 +2086,7 @@ build/bin/list_members:bin/list_members \
 build/bin/list_owners:bin/list_owners \
 build/bin/mailmanctl:bin/mailmanctl \
 build/bin/mmsitepass:bin/mmsitepass \
+build/bin/msgfmt.py:bin/msgfmt.py \
 build/bin/newlist:bin/newlist \
 build/bin/pygettext.py:bin/pygettext.py \
 build/bin/qrunner:bin/qrunner \