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/debug.h

@@ -92,7 +92,7 @@ const char *GetDebugString();
  * TIC() / TOC() creates its own block, so make sure not the mangle
  *  it with another block.
  *
- * The output is counted in CPU cycles, and not comparable accross
+ * The output is counted in CPU cycles, and not comparable across
  *  machines. Mainly useful for local optimisations.
  **/
 #define TIC() {\