tree 49f2aaa811a691a50e4692dba8193c9eee8fb476
parent b5072acc87b05efe259f734b7f343b70c5747525
author Bob Copeland <me@bobcopeland.com> 1509593703 -0400
committer Bob Copeland <me@bobcopeland.com> 1509593703 -0400

w-t: fix up some merge damage

Signed-off-by: Bob Copeland <me@bobcopeland.com>