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

[Thomas Moschny]

commit 215bd44cb0eef44da15557d19d3ef25a501a1c37
Merge: 495cbf8 38525cd
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sat Jul 2 13:05:39 2011 +0200

    Merge branch 'master' into el6

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