Merge "Fix up various issues leading to bug 40780."
authorTheDJ <hartman.wiki@gmail.com>
Mon, 15 Oct 2012 20:02:50 +0000 (20:02 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 15 Oct 2012 20:02:50 +0000 (20:02 +0000)

Trivial merge