svnmerge from trunk for r70457 (sorry, I accidentally deleted the commit message)
diff --git a/Lib/locale.py b/Lib/locale.py
index 5f7b082..17056b9 100644
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -158,7 +158,7 @@
     groups.reverse()
     return (
         left_spaces + thousands_sep.join(groups) + right_spaces,
-        len(groups) - 1
+        len(thousands_sep) * (len(groups) - 1)
     )
 
 # Strip a given amount of excess padding from the given string