[botan/f13/master: 6/6] Merge branch 'master' into f13

[Thomas Moschny]

commit 6d41d560c5b77b6ebd6f89b071075a6d2e088756
Merge: 632b63e 0781893
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sat Aug 28 23:11:14 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	botan.spec
    	sources

 .gitignore    |    3 ++-
 README.fedora |   13 +++++++++++++
 botan.spec    |   23 ++++++++++++++++++++---
 repack.sh     |   23 +++++++++++++++++++++++
 sources       |    2 +-
 5 files changed, 59 insertions(+), 5 deletions(-)
---