chiark / gitweb /
merge changes from --ubuntu branch