Merge "Update and fix AutoLoader definitions."
authorAaron Schulz <aschulz@wikimedia.org>
Sun, 17 Jun 2012 18:16:25 +0000 (18:16 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 17 Jun 2012 18:16:25 +0000 (18:16 +0000)

Trivial merge