Trianglized [2/2]

Conflicts:
	config/common.mk