Merge pull request #1484 from poettering/ask-pass-kernel-keyring

cache harddisk passwords in the kernel keyring

diff --cc src/basic/strv.c
Simple merge

diff --cc src/core/main.c
Simple merge