Includes fixes for GnuPG v0.3.x and v1.2.x