Merged revisions 67522-67523 via svnmerge from

Merged revisions 67522-67523 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r67522 | andrew.kuchling | 2008-12-04 10:07:14 -0500 (Thu, 04 Dec 2008) | 1 line

  Wording change (flaunt -> disobey); markup fixes.  The largest edit is to the paragraph on relative imports; please review.  (Backport candidate)
........
  r67523 | fred.drake | 2008-12-04 10:28:51 -0500 (Thu, 04 Dec 2008) | 3 lines

  - fix markup error
  - remove silly emoticon
........