[botan/el5/master: 20/20] Merge branch 'master' into el5

[Thomas Moschny]

commit 5d6ca9cb9949af6850a056ff0326c41ec5ed4276
Merge: 8cbc64c 64a9a24
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sun Aug 29 12:30:10 2010 +0200

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore

 .gitignore    |    3 +-
 README.fedora |   14 ++++++++++
 botan.spec    |   81 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 repack.sh     |   23 ++++++++++++++++
 sources       |    2 +-
 5 files changed, 115 insertions(+), 8 deletions(-)
---