fix auto margin with explicit width layout

Conflicts:
	test/layout/layout-box.js