Merged with gpg 1.4.3 code.