From: Martin v. Löwis <martin@v.loewis.de>
Date: Sat, 28 May 2011 12:06:55 +0000 (+0200)
Subject: merge 2.5.6c1 tag
X-Git-Tag: v2.6.7~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=228516c3f8a237c41b81b853bb64d1db72bc3103;p=thirdparty%2FPython%2Fcpython.git

merge 2.5.6c1 tag
---

228516c3f8a237c41b81b853bb64d1db72bc3103
diff --cc .hgtags
index 1f9f2dd2c119,1734daa6684d..82294f4be9d6
--- a/.hgtags
+++ b/.hgtags
@@@ -112,4 -112,4 +112,5 @@@ a0a6d9909312ad9c1d844af66e9c91931b93852
  657f16582943739b906f66f7efad4014492c8b1c v2.5.5c1
  1dc91e9dd5c13a4bc2d3bb7d4b5896ab264f2325 v2.5.5c2
  7098a46f0b75e5aacfaf81d65d72e3613b023532 v2.5.5
 +a87c7b96672b69dffef64c59b56fba5bb2059b99 v2.5.6c1
+ de34c7b097e8d66b1140c211dbd61d48b31ba483 v2.5.6