chiark / gitweb /
merge fixes/clarifications - sort out complex case D = C