added back all the stuff that r44 accidentily removed
added back all the stuff that r44 accidentily removed

--HG--
extra : convert_revision : svn%3A69d324d9-c39d-4fdc-8679-7745eae9e2c8/trunk%4045

theatlantic/django-south,theatlantic/django-south