Merge remote-tracking branch 'justblair/master' into Marlin_v1

author Erik van der Zalm <erik@vdzalm.eu>

Sat, 3 Mar 2012 19:20:55 +0000 (20:20 +0100)

committer Erik van der Zalm <erik@vdzalm.eu>

Sat, 3 Mar 2012 19:20:55 +0000 (20:20 +0100)
author Erik van der Zalm <erik@vdzalm.eu>
Sat, 3 Mar 2012 19:20:55 +0000 (20:20 +0100)
committer Erik van der Zalm <erik@vdzalm.eu>
Sat, 3 Mar 2012 19:20:55 +0000 (20:20 +0100)
diff --cc Marlin/Marlin.pde
Simple merge
diff --cc Marlin/pins.h
Simple merge
diff --cc Marlin/planner.cpp
Simple merge
diff --cc Marlin/ultralcd.pde
Simple merge
author	Erik van der Zalm <erik@vdzalm.eu>
	Sat, 3 Mar 2012 19:20:55 +0000 (20:20 +0100)
committer	Erik van der Zalm <erik@vdzalm.eu>
	Sat, 3 Mar 2012 19:20:55 +0000 (20:20 +0100)
		1	2
Marlin/Marlin.pde	patch \|	diff1 \|	diff2 \|	blob \| history
Marlin/pins.h	patch \|	diff1 \|	diff2 \|	blob \| history
Marlin/planner.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
Marlin/ultralcd.pde	patch \|	diff1 \|	diff2 \|	blob \| history