fixes #648
Merge remote-tracking branch 'remotes/upstream/mc1.5' into patch-648

Conflicts:
	common/buildcraft/transport/BlockGenericPipe.java
Merge pull request #688 from Flow86/patch-648

Resubmit for 1.5: fixes #648
Merge remote-tracking branch 'remotes/upstream/mc1.5' into 1.5