Automated merge with https://bitbucket.org/andrewgodwin/south
Automated merge with https://bitbucket.org/andrewgodwin/south

nimnull/django-south,philipn/django-south,nimnull/django-south,RaD/django-south,philipn/django-south,RaD/django-south,RaD/django-south