General conventions:

For a branch FOO, we have:
	FOO-root	point at which FOO leaves trunk or parent branch
	FOO-merge-N	Nth branch merge point

`ec' -- elliptic curve work
	No merges