dridzt:
	- How about we actually commit the button fixes ;-)
