Merge "Some fixes for Ia2782d64 (2f60cd2)"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 5 Jan 2013 22:04:17 +0000 (22:04 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 5 Jan 2013 22:04:17 +0000 (22:04 +0000)

Trivial merge