Fix merge conflict with widgets.py

I simple copy/pasted the stable 1.5x widgets.py directly from the django
1.5x upstream repo.