Merged revisions 62805,62811,62841-62842,62848-62849,62853-62854 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62805 | christian.heimes | 2008-05-07 01:59:53 +0200 (Wed, 07 May 2008) | 1 line

  Re-added getbuildinfo.c solution item
........
  r62811 | benjamin.peterson | 2008-05-07 04:23:43 +0200 (Wed, 07 May 2008) | 2 lines

  update .bzrignore
........
  r62841 | christian.heimes | 2008-05-08 00:54:17 +0200 (Thu, 08 May 2008) | 1 line

  Replace more float hacks with correct math functions
........
  r62842 | benjamin.peterson | 2008-05-08 01:11:54 +0200 (Thu, 08 May 2008) | 2 lines

  Practice EAFP, and revert 62787
........
  r62848 | raymond.hettinger | 2008-05-08 06:35:20 +0200 (Thu, 08 May 2008) | 1 line

  Frozensets do not benefit from autoconversion.
........
  r62849 | raymond.hettinger | 2008-05-08 06:36:12 +0200 (Thu, 08 May 2008) | 1 line

  The __all__ variable forgot to expose the gcd() function.
........
  r62853 | raymond.hettinger | 2008-05-08 09:23:30 +0200 (Thu, 08 May 2008) | 1 line

  Fix-up the enumerate type example and move it to the end.
........
  r62854 | ronald.oussoren | 2008-05-08 12:34:39 +0200 (Thu, 08 May 2008) | 3 lines

  Fix for issue 1770190: platform.mac_ver() now returns the right
  version on OSX 10.4.10
........

1 files changed, 5 insertions, 1 deletions

diff --git a/.bzrignore b/.bzrignore
index 1afc28a..e694246 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,4 +1,4 @@
-.purify
+´.purify
 autom4te.cache
 config.log
 config.cache
@@ -41,3 +41,7 @@ Modules/Setup.local
 Modules/config.c
 Parser/pgen
 Lib/plat-mac/errors.rsrc.df.rsrc
+Lib/lib2to3/Grammar2.6.0.alpha.1.pickle
+Lib/lib2to3/Grammar2.6.0.alpha.2.pickle
+Lib/lib2to3/PatternGrammar2.6.0.alpha.1.pickle
+Lib/lib2to3/PatternGrammar2.6.0.alpha.2.pickle