chiark / gitweb /
merge work from samual/lalonde