Index: py2app/py2app/bundletemplate/prebuilt/main
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: py2app/py2app/bundletemplate/setup.py
===================================================================
--- py2app/py2app/bundletemplate/setup.py	(revision 87)
+++ py2app/py2app/bundletemplate/setup.py	(working copy)
@@ -17,8 +17,8 @@
         #CC = os.environ.get("CC", "cc")
         #CFLAGS = '-Os -Wall'
         #LDFLAGS = '-g -bundle -framework Foundation -framework AppKit'
-        os.environ['MACOSX_DEPLOYMENT_TARGET']='10.3'
-        os.system('"%(CC)s" -arch i386 -arch ppc -o "%(dest)s" "%(src)s" %(CFLAGS)s %(LDFLAGS)s' % locals())
+        os.environ['MACOSX_DEPLOYMENT_TARGET']='10.4'
+        os.system('"%(CC)s" -arch i386 -arch x86_64 -arch ppc -o "%(dest)s" "%(src)s" %(CFLAGS)s %(LDFLAGS)s' % locals())
         os.system('strip -Sx "%(dest)s"' % locals())
     return dest
 
Index: py2app/py2app/apptemplate/lib/site.py
===================================================================
--- py2app/py2app/apptemplate/lib/site.py	(revision 87)
+++ py2app/py2app/apptemplate/lib/site.py	(working copy)
@@ -12,6 +12,7 @@
 if not _parent.endswith(_libdir):
     _parent += _libdir
 sys.path.append(_parent + '/site-packages.zip')
+sys.path.insert(0, _parent + '/lib-dynload')
 
 # Stuffit decompresses recursively by default, that can mess up py2app bundles,
 # add the uncompressed site-packages to the path to compensate for that.
Index: py2app/py2app/apptemplate/prebuilt/main
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: py2app/py2app/apptemplate/setup.py
===================================================================
--- py2app/py2app/apptemplate/setup.py	(revision 87)
+++ py2app/py2app/apptemplate/setup.py	(working copy)
@@ -13,8 +13,8 @@
         cfg = distutils.sysconfig.get_config_vars()
         CC = cfg['CC']
         CFLAGS = cfg['CFLAGS'].replace(' -dynamic', '')
-        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
-        os.system('"%(CC)s" -arch i386 -arch ppc -o "%(dest)s" "%(src)s" %(CFLAGS)s' % locals())
+        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
+        os.system('"%(CC)s" -arch i386 -arch x86_64 -arch ppc -o "%(dest)s" "%(src)s" %(CFLAGS)s' % locals())
         #os.system('strip "%(dest)s"' % locals())
     return dest
 
Index: py2app/py2app/bootstrap/argv_emulation.py
===================================================================
--- py2app/py2app/bootstrap/argv_emulation.py	(revision 87)
+++ py2app/py2app/bootstrap/argv_emulation.py	(working copy)
@@ -37,9 +37,13 @@
             if len(sys.argv) > 1 and sys.argv[1][:4] == '-psn':
                 del sys.argv[1]
 
-            stoptime = Evt.TickCount() + timeout
-            while not self.quitting and Evt.TickCount() < stoptime:
-                self._dooneevent(mask, timeout)
+            try:
+                stoptime = Evt.TickCount() + timeout
+                while not self.quitting and Evt.TickCount() < stoptime:
+                    self._dooneevent(mask, timeout)
+            except AttributeError:
+                pass
+            
 
             if not self.quitting:
                 print "argvemulator: timeout waiting for arguments"