Merge branch 'switch-to-gpgk' into master
Resolved Conflicts:
- common/asshelp.c: Keep the new code in master for spawing under
Windows.
- g10/Makefile.am: Keep all new file.
- g10/photoid.c: Pass CTRL to pct_expando.
- Signed-off-by: Werner Koch <wk@gnupg.org>