Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
files 2d7666cde2 simplify add_rcconf 11 lat temu
src b782769986 add adk-test-tools package 12 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu