Merge remote-tracking branch 'remotes/upstream/master' into 1.5.2
Wooden Power Pipes now add power to themselves...

...instead of their neighbor. The result being that they are constrained
by the new limits and that they actually render the power flow in
themselves.

Wooden Pipes are set with a input cap of 32 MJ/t, buffed from the
previous effective limit of 29 MJ/t.

Note that this also effectively adds a 32 MJ/t pipe that can be used for
limiting flows.
Add fallback to the missing icon while rendering pipes in the inventory
fix last commit, wrong texture sheet
Tweak build file for "included" building e.g. ABO..
Merge remote-tracking branch 'remotes/origin/1.5.2' into 1.5.2
Merge remote-tracking branch 'remotes/upstream/master' into 1.5.2

Conflicts:
	build.xml
	common/buildcraft/transport/pipes/PipePowerWood.java