Merge mergemaster.8:1.34, mergemaster.sh:1.53 from HEAD to RELENG_6:
Add a -A argument to mergemaster to allow explicitly specifying an architecture to pass through to the underlying makefiles. This is quite useful when building on an i386 box to populate an amd64 NFS root. Head nod: dougb
Approved by: re (scottl)