Merge "Fix https://gerrit.wikimedia.org/r/4830 , I botched the conflict resolution...
authorDemon <chadh@wikimedia.org>
Fri, 13 Apr 2012 00:49:41 +0000 (00:49 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 13 Apr 2012 00:49:41 +0000 (00:49 +0000)

Trivial merge