Merged revisions 68152,68155 via svnmerge from

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

................
  r68152 | ronald.oussoren | 2009-01-02 05:48:29 -0600 (Fri, 02 Jan 2009) | 2 lines

  Fix for issue 3433
................
  r68155 | ronald.oussoren | 2009-01-02 07:10:34 -0600 (Fri, 02 Jan 2009) | 17 lines

  Recorded merge of revisions 68153 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r68153 | ronald.oussoren | 2009-01-02 13:59:32 +0100 (Fri, 02 Jan 2009) | 10 lines

    Fix for issue3559: No preferences menu in IDLE on OSX

    1) Add a comment to the help file to that points to the
       preferences menu.

    2) An earlier checkin tried to detect Tk >= 8.10.14,
       but did this in the wrong way. The end result of this
       was that the IDLE->Preferences... menu got surpressed
       when using the system version of Tcl/Tk
  ........
................