This is a vendor-branch import by now, the merge with our regular tree will happen later. Obtained from: Eric Youngdale of Yggdrasil Computing Inc.