[development] Tagging and branching, again.

[David K Norman]

When I got in trouble for branching someone else's contrib stuff,
TortoiseCVS's remove branch command let me merge the 4-7 branch back
into HEAD, deleting the 4-7 and just putting some weirdly, long numbered
1.6.1.2-type versions in the HEAD branch. I'll take a shot removing an
unwanted 4-7 branch if someone tells me, gives permission, etc.