Merge branch 'ben/howto-update-02' of ssh+git://playfair.gnupg.org/git/gpgme