Automated merge with ssh://hg@bitbucket.org/andrewgodwin/south/
Automated merge with ssh://hg@bitbucket.org/andrewgodwin/south/

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