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

[Thomas Moschny]

commit ba30cdaf6054aacea8a87dedb5f102e69adf9ee6
Merge: f351d71 bf3746d
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Thu Jul 21 18:08:37 2011 +0200

    Merge branch 'master' into el6

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