We reverted back to the previous commit to make only one change making
it easier for a pull request to be accepted.
Merge branch 'master' of https://github.com/Ottomoeller/CraftBukkit

Conflicts:
	src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java