Merge "Fix type of exception no longer matching after someone changed it without...
authorAaron Schulz <aschulz@wikimedia.org>
Fri, 24 Aug 2012 20:49:00 +0000 (20:49 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 24 Aug 2012 20:49:00 +0000 (20:49 +0000)

Trivial merge