Revision Date Author Comments
# b9988867 01-Mar-2024 christos <christos@NetBSD.org>

merge conflicts between 3.43.0 and 3.45.1
# f3c4d887 04-Sep-2023 christos <christos@NetBSD.org>

merge conflicts between 3.26.0 and 3.34.0
# 51db93b1 19-Dec-2018 christos <christos@NetBSD.org>

merge conflicts.