Fixed #12608 -- No longer return inconsistent results when using `values` and...

Fixed #12608 -- No longer return inconsistent results when using `values` and `values_list` in conjunction with `annotate`.  Thanks, Charlie Leifer.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@12505 bcc190cf-cafb-0310-a4f2-bffc1f526a37