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

--HG--
extra : convert_revision : svn%3Abcc190cf-cafb-0310-a4f2-bffc1f526a37/django/trunk%406425

Belgabor/django,Belgabor/django,Belgabor/django