K 10
svn:author
V 3
imp
K 8
svn:date
V 27
2001-08-11T02:03:51.000000Z
K 7
svn:log
V 150
Note: mergemaster stopped being optional a long time ago.  Caution against
doing it by hand (but provide pointers to those wanting to do it by hand).

END