Bring git v0.98.5 tree in sync with released v0.98.5.

Sadly, the conversion from Bitkeeper -> CVS -> git wasn't perfect.  Or
so it seems.
30 files changed