[gnupg2/f14/master: 3/3] Merge branch 'master' into f14

[Tomáš Mráz]

commit 769c54df0cdf52c2348e863407d8737003333887
Merge: d975e62 dc310bd
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Mon Aug 16 12:15:36 2010 +0200

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

 gnupg-2.0.13-insttools.patch |   58 ------------------------------------------
 gnupg2.spec                  |   18 +++----------
 2 files changed, 4 insertions(+), 72 deletions(-)
---