Merge target-factory (2.5-7+rpi2) import into refs/heads/workingbranch
authorPeter Michael Green <plugwash@raspbian.org>
Sat, 3 Dec 2022 16:04:38 +0000 (16:04 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Sat, 3 Dec 2022 16:04:38 +0000 (16:04 +0000)

Trivial merge