Merge branch 'SteamEngine' of github.com:daid/Cura into SteamEngine

author daid <daid303@gmail.com>

Fri, 7 Mar 2014 10:30:30 +0000 (11:30 +0100)

committer daid <daid303@gmail.com>

Fri, 7 Mar 2014 10:30:30 +0000 (11:30 +0100)
author daid <daid303@gmail.com>
Fri, 7 Mar 2014 10:30:30 +0000 (11:30 +0100)
committer daid <daid303@gmail.com>
Fri, 7 Mar 2014 10:30:30 +0000 (11:30 +0100)
diff --cc Cura/util/profile.py
Simple merge
diff --cc Cura/util/sliceEngine.py
Simple merge
author	daid <daid303@gmail.com>
	Fri, 7 Mar 2014 10:30:30 +0000 (11:30 +0100)
committer	daid <daid303@gmail.com>
	Fri, 7 Mar 2014 10:30:30 +0000 (11:30 +0100)
		1	2
Cura/util/profile.py	patch \|	diff1 \|	diff2 \|	blob \| history
Cura/util/sliceEngine.py	patch \|	diff1 \|	diff2 \|	blob \| history