Merge branch 'nullbooleanfield_testcase' of git://github.com/dpetzel/django-rest-framework into dpetzel-nullbooleanfield_testcase

Conflicts:
	rest_framework/tests/test_serializer.py