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

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

Mon, 30 Apr 2012 11:36:27 +0000 (13:36 +0200)

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

Mon, 30 Apr 2012 11:36:27 +0000 (13:36 +0200)
author Erik van der Zalm <erik@vdzalm.eu>
Mon, 30 Apr 2012 11:36:27 +0000 (13:36 +0200)
committer Erik van der Zalm <erik@vdzalm.eu>
Mon, 30 Apr 2012 11:36:27 +0000 (13:36 +0200)
diff --cc Marlin/Configuration.h
Simple merge
diff --cc Marlin/Marlin.pde
Simple merge
author	Erik van der Zalm <erik@vdzalm.eu>
	Mon, 30 Apr 2012 11:36:27 +0000 (13:36 +0200)
committer	Erik van der Zalm <erik@vdzalm.eu>
	Mon, 30 Apr 2012 11:36:27 +0000 (13:36 +0200)
		1	2
Marlin/Configuration.h	patch \|	diff1 \|	diff2 \|	blob \| history
Marlin/Marlin.pde	patch \|	diff1 \|	diff2 \|	blob \| history