6455242 nightly should be able to preserve all proto areas from a single build.
6467531 nightly(1) needs option to generate OpenSolaris delivery