Merged revisions 68062,68064 via svnmerge from

Merged revisions 68062,68064 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r68062 | ronald.oussoren | 2008-12-30 06:59:02 -0600 (Tue, 30 Dec 2008) | 12 lines

  Make it possible to install a framework build of Python 3.x on OSX.

  This the build machinery on OSX to re-enable building (and installing)
  PythonLauncher.app and IDLE.app.

  This needs ports of fixes to Lib/distutils/util.py and Include/pymacconfig.h
  to be fully functiontional, to be fully functional.

  I also have a patch for Makefile.pre.in that I'll post on bugs.python.org
  for review.
........
  r68064 | ronald.oussoren | 2008-12-30 08:16:51 -0600 (Tue, 30 Dec 2008) | 11 lines

  Py3k: update OSX installer-generator

  This update makes sure that the installer won't write files
  in /usr/local/bin by default. The installer also won't
  replace /Library/Frameworks/Python.framework/Version/Current.

  Both to ensure that the installer doens't break an existing
  install of python 2.x.
........