Merged revisions 84705 via svnmerge from

benjaminp · benjaminp · commit 5d7d9e689922 · 2010-09-11T16:23:57.000Z
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84705 | georg.brandl | 2010-09-11 01:39:58 -0500 (Sat, 11 Sep 2010) | 1 line

  Add new generated file to ignoreds.
........
diff --git a/.bzrignore b/.bzrignore
@@ -45,6 +45,7 @@ Modules/Setup
 Modules/Setup.config
 Modules/Setup.local
 Modules/config.c
+Modules/ld_so_aix
 Parser/pgen
 Lib/lib2to3/Grammar*.pickle
 Lib/lib2to3/PatternGrammar*.pickle
diff --git a/.hgignore b/.hgignore
@@ -48,7 +48,7 @@ Modules/Setup.local
 Modules/config.c
 Parser/pgen
 core
-
+Modules/ld_so_aix$
 syntax: glob
 libpython*.a
 *.o
