Merged revisions 70737 via svnmerge from

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

........
  r70737 | ronald.oussoren | 2009-03-30 14:34:51 -0500 (Mon, 30 Mar 2009) | 6 lines

  * Set a custom icon on the Python installer DMG
  * Remove last traces of "MacPython"
  * Add options to build different flavors of the installer
    (still defaulting to a 2-way universal build that
    runs on OSX 10.3)
........