text := The apple-osx branch is merged with trunk and basic tests work.
This is a separate unreleased branch and is not expected to pass
status := ok
owner := dan
comment := "When running "make test", there are errors in superlock-6.6 and zerodamage-3.1. Both are benign."