[gnupg2/f16: 4/4] Merge branch 'master' into f16

[Tomáš Mráz]

commit 88baaa2fd499bb2a556d2d1dc9f45f395d69e6d3
Merge: e2d2e6a 2af6509
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Thu Jan 3 11:30:27 2013 +0100

    Merge branch 'master' into f16
    
    Conflicts:
    	gnupg2.spec

 gnupg-2.0.19-cve-2012-6085.patch |   61 ++++++++++++++++++++++++++++++++++++++
 gnupg-2.0.19-fips-algo.patch     |   41 +++++++++++++++++++++++++
 gnupg2.spec                      |   12 +++++++-
 3 files changed, 113 insertions(+), 1 deletions(-)
---