Merge branch 'master' of ssh://dev.alpinelinux.org/gitroot/apk-tools

src/add.c

src/apk.c

src/apk_database.h

src/apk_defines.h

src/apk_package.h

src/apk_state.h

src/database.c

src/package.c

src/state.c