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

[Thomas Moschny]

commit ca6522e5e4e706e94fca8882198565d74a1f562e
Merge: 2c757b1 d8792c2
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Wed Jul 20 23:35:19 2011 +0200

    Merge branch 'master' into el5

 .gitignore |    1 +
 botan.spec |    5 ++++-
 repack.sh  |    2 +-
 sources    |    2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)
---