$ 0 0 *MERGE* Merge the latest trunk enhancements into the bedrock branch through the wal2 intermediary. (tags: bedrock)