Bukkit/CraftBukkit — pull request #521 by lukegb (2011-10-30 22:45:21+00:00)
Title: Fix breaking everyone's builds!

Same as other.