Merge "Follow up to dirname( __FILE__ ) clean up"
authorSiebrand <siebrand@wikimedia.org>
Tue, 28 Aug 2012 21:53:58 +0000 (21:53 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 28 Aug 2012 21:53:58 +0000 (21:53 +0000)

Trivial merge