Django 1.4

Jonas, please bear with me a bit, I don't really understand the github pull request system.  This is another alternative... can you create a new Django 1.4 branch from this pull request?  This essentially takes the latest Development branch and adds all the changes that were in features/django-1.4 to it.

I tried to do the rebasing but it seemed like I still had to do a merge, I might have had the source/destination branches mixed up though.