Merged revisions 69700 via svnmerge from

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

........
  r69700 | tarek.ziade | 2009-02-16 23:38:43 +0100 (Mon, 16 Feb 2009) | 1 line

  note about #2279
........