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

[Thomas Moschny]

commit a9d68405b15e8ee00364ee50c5fd34ed3c8f24a1
Merge: ca6522e bf3746d
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Thu Jul 21 18:09:34 2011 +0200

    Merge branch 'master' into el5

 botan-1.8.13-soname.patch |   12 ++++++++++++
 botan.spec                |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---