[Python-checkins] cpython (merge 2.5 -> 2.6): Nearly null-merge 2.5.6

[martin.v.loewis]

http://hg.python.org/cpython/rev/23340842e920
changeset:   70460:23340842e920
branch:      2.6
parent:      70303:2d760cb20e1e
parent:      70459:0072a98566c7
user:        Martin v. Löwis <martin at v.loewis.de>
date:        Sat May 28 14:13:32 2011 +0200
summary:
  Nearly null-merge 2.5.6

files:
  .hgtags |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -112,6 +112,8 @@
 657f16582943739b906f66f7efad4014492c8b1c v2.5.5c1
 1dc91e9dd5c13a4bc2d3bb7d4b5896ab264f2325 v2.5.5c2
 7098a46f0b75e5aacfaf81d65d72e3613b023532 v2.5.5
+a87c7b96672b69dffef64c59b56fba5bb2059b99 v2.5.6c1
+de34c7b097e8d66b1140c211dbd61d48b31ba483 v2.5.6
 2d0bd095c420b0711000d9be66848f6cfd972b3b v2.6a1
 eec144917a189be11ed5efa35c6604d03bc62bcc v2.6a2
 48e9fb0a721799877f26edaef01ac6e6029b6812 v2.6a3

-- 
Repository URL: http://hg.python.org/cpython