Bukkit/Bukkit — pull request #459 by Sleaker (2011-12-16 17:29:36+00:00)
Title: BUkkit 313 and 342 fixes

See commit notes on each