Backed out [6165]. It breaks things for people using psycopg2 because it requires psycopg to also be installed due to imports.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6171 bcc190cf-cafb-0310-a4f2-bffc1f526a37