diff --git a/AUTHORS b/AUTHORS
index 355206b15df..924edf09c37 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -74,6 +74,7 @@ answer newbie questions, and generally made Django that much better:
     Cameron Knight (ckknight)
     Bruce Kroeze <http://coderseye.com/>
     Joseph Kocherhans
+    konrad@gwu.edu
     lakin.wecker@gmail.com
     Stuart Langridge <http://www.kryogenix.org/>
     Eugene Lazutkin <http://lazutkin.com/blog/>
diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py
index 44d7d9ffe8c..cfbdca4160d 100644
--- a/django/contrib/auth/models.py
+++ b/django/contrib/auth/models.py
@@ -160,7 +160,7 @@ class User(models.Model):
     def get_all_permissions(self):
         if not hasattr(self, '_perm_cache'):
             import sets
-            self._perm_cache = sets.Set(["%s.%s" % (p.content_type.app_label, p.codename) for p in self.user_permissions.all()])
+            self._perm_cache = sets.Set(["%s.%s" % (p.content_type.app_label, p.codename) for p in self.user_permissions.select_related()])
             self._perm_cache.update(self.get_group_permissions())
         return self._perm_cache