Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.Approved by: re (implicit)Sponsored by: The FreeBSD Foundation
Sync with upstream version (20130520) that includes same fixes made last week.
Import bmake-20130520 to keep us in sync.