Fixed #5598 -- Restored needed imports that were removed in [6333].  Thanks, gav.
Fixed #5598 -- Restored needed imports that were removed in [6333].  Thanks, gav.


git-svn-id: 554f83ef17aa7291f84efa897c1acfc5d0035373@6425 bcc190cf-cafb-0310-a4f2-bffc1f526a37

svn2github/django,svn2github/django,svn2github/django