Merge "Don't make two database requests to load the same object, again."
authorAaron Schulz <aschulz@wikimedia.org>
Tue, 8 May 2012 18:50:14 +0000 (18:50 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 8 May 2012 18:50:15 +0000 (18:50 +0000)

Trivial merge