Merge from vendor branch BMAKE:
authorsjg <sjg>
Fri, 2 Dec 2005 00:03:00 +0000 (00:03 +0000)
committersjg <sjg>
Fri, 2 Dec 2005 00:03:00 +0000 (00:03 +0000)
commit12439f7aff08d7b2b71edab37ecae230cf27fed3
treeb684c9c8c1ee0a02b73c185dfd7863f89567130d
parentf0bee3de7dc8c00d20a2fce494cf9ac79fa77e32
parent7e8a2bb9406801ff22a5b22d4b56914d318eaba8
Merge from vendor branch BMAKE:
Import bmake-20051105