K 10
svn:author
V 7
rwatson
K 8
svn:date
V 27
2008-05-10T18:43:57.000000Z
K 7
svn:log
V 170
Merge Makefile:1.348 from HEAD to RELENG_7:

  Mention -U and -ai arguments to mergemaster in a comment for the
  general mergemaster line.

  Suggested by:   Ben Laurie

END