From 037535ac40f5bc01c17f6333f7d31412b5417571 Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Dec 29 2010 03:48:27 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/python


Conflicts:
	python.spec

---

diff --git a/python.spec b/python.spec
index 4bb13e1..dfafa41 100644
--- a/python.spec
+++ b/python.spec
@@ -1618,6 +1618,9 @@ compat), patch 123 (2to3 on "from itertools import *")
 - fix test_abc's test_cache_leak in the debug build (patch 128)
 - drop _weakref.so from manifest (_weakref became a core module in r84230)
 
+* Wed Sep 29 2010 jkeating - 2.7-13
+- Rebuilt for gcc bug 634757
+
 * Mon Sep 27 2010 David Malcolm <dmalcolm@redhat.com> - 2.7-12
 - fix test_structmember on 64bit-bigendian (patch 127)