Merge "Followup Idfee1b4d per Tim"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 26 Jul 2013 17:24:27 +0000 (17:24 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 26 Jul 2013 17:24:27 +0000 (17:24 +0000)

Trivial merge