Merge branch 'master' into jgrpp

# Conflicts:
#	source.list
#	src/blitter/32bpp_anim.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/order_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_type.h

src/linkgraph/linkgraphjob.h

@@ -457,7 +457,7 @@ public:
 protected:
 
 	/**
-	 * Some boundaries to clamp agains in order to avoid integer overflows.
+	 * Some boundaries to clamp against in order to avoid integer overflows.
 	 */
 	enum PathCapacityBoundaries {
 		PATH_CAP_MULTIPLIER = 16,