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

[Thomas Moschny]

commit 2c757b1128757178118e412cbff1f7d34f2ee36b
Merge: 23bb4aa 38525cd
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sat Jul 2 13:28:44 2011 +0200

    Merge branch 'master' into el5

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