From: doko@ubuntu.com <doko@ubuntu.com>
Date: Thu, 17 Apr 2014 15:55:03 +0000 (+0200)
Subject: Merge 3.4
X-Git-Tag: v3.5.0a1~1835
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2273ab2a0df96b96b7a5794537ca78a13129e3c4;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4
---

2273ab2a0df96b96b7a5794537ca78a13129e3c4
diff --cc Misc/NEWS
index 5c6a5be4903c,36322c237356..b26db8cfcc0a
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -244,8 -167,9 +244,14 @@@ IDL
  Build
  -----
  
++<<<<<<< local
 +- Issue #17861: Tools/scripts/generate_opcode_h.py automatically regenerates
 +  Include/opcode.h from Lib/opcode.py if the later gets any change.
++=======
+ - Issue #15234: For BerkelyDB and Sqlite, only add the found library and
+   include directories if they aren't already being searched. This avoids
+   an explicit runtime library dependency.
++>>>>>>> other
  
  - Issue #20644: OS X installer build support for documentation build changes
    in 3.4.1: assume externally supplied sphinx-build is available in /usr/bin.