Merged revisions 80980 via svnmerge from

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

........
  r80980 | michael.foord | 2010-05-08 17:09:37 +0200 (Sat, 08 May 2010) | 1 line

  Documenting test discovery from package name and potential problems with test discovery importing tests from the wrong location. Issue 7780 and issue 8547.
........