A way better fix for the count() issue in [7787].
A way better fix for the count() issue in [7787].

The first attempt was brain-damaged. Let's never speak of it again.

--HG--
extra : convert_revision : svn%3Abcc190cf-cafb-0310-a4f2-bffc1f526a37/django/trunk%407788

Belgabor/django,Belgabor/django,Belgabor/django