Merge "Fix Ifb93e49b"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 13 Mar 2013 16:04:26 +0000 (16:04 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 13 Mar 2013 16:04:26 +0000 (16:04 +0000)

Trivial merge