Merge "Fixes for e288e4036"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 11 Mar 2013 16:22:48 +0000 (16:22 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 11 Mar 2013 16:22:48 +0000 (16:22 +0000)

Trivial merge