Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

author Daid <daid303@gmail.com>

Sat, 19 May 2012 15:38:46 +0000 (17:38 +0200)

committer Daid <daid303@gmail.com>

Sat, 19 May 2012 15:38:46 +0000 (17:38 +0200)
author Daid <daid303@gmail.com>
Sat, 19 May 2012 15:38:46 +0000 (17:38 +0200)
committer Daid <daid303@gmail.com>
Sat, 19 May 2012 15:38:46 +0000 (17:38 +0200)
diff --cc Marlin/Configuration.h
Simple merge
diff --cc Marlin/planner.cpp
Simple merge
diff --cc Marlin/ultralcd.pde
Simple merge
author	Daid <daid303@gmail.com>
	Sat, 19 May 2012 15:38:46 +0000 (17:38 +0200)
committer	Daid <daid303@gmail.com>
	Sat, 19 May 2012 15:38:46 +0000 (17:38 +0200)
		1	2
Marlin/Configuration.h	patch \|	diff1 \|	diff2 \|	blob \| history
Marlin/planner.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
Marlin/ultralcd.pde	patch \|	diff1 \|	diff2 \|	blob \| history