chiark / gitweb /
Fix a few merge mistakes