Merge remote-tracking branch 'daid/Marlin_v1' into Test

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

Sun, 26 Feb 2012 15:10:59 +0000 (16:10 +0100)

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

Sun, 26 Feb 2012 15:10:59 +0000 (16:10 +0100)
author Erik van der Zalm <erik@vdzalm.eu>
Sun, 26 Feb 2012 15:10:59 +0000 (16:10 +0100)
committer Erik van der Zalm <erik@vdzalm.eu>
Sun, 26 Feb 2012 15:10:59 +0000 (16:10 +0100)
diff --cc Marlin/Configuration.h
Simple merge
diff --cc Marlin/temperature.cpp
Simple merge
author	Erik van der Zalm <erik@vdzalm.eu>
	Sun, 26 Feb 2012 15:10:59 +0000 (16:10 +0100)
committer	Erik van der Zalm <erik@vdzalm.eu>
	Sun, 26 Feb 2012 15:10:59 +0000 (16:10 +0100)
		1	2
Marlin/Configuration.h	patch \|	diff1 \|	diff2 \|	blob \| history
Marlin/temperature.cpp	patch \|	diff1 \|	diff2 \|	blob \| history