Merge with 3.4

diff --cc Lib/idlelib/idlever.py
index c41b4997b6189e01844c25ae922734d4f1f35451,37b7712a47624a7ad51ef95e3e859ca9a5461d82..563d933f3bd66e319ed3e195479128cd03095b4f
--- 1/Lib/idlelib/idlever.py
--- 2/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@@ -1,1 -1,5 +1,4 @@@
- IDLE_VERSION = "3.5.0a4"
+ """Unused by Idle: there is no separate Idle version anymore.
+ Kept only for possible existing extension use."""
+ from sys import version
+ IDLE_VERSION = version[:version.index(' ')]
 -