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

[Thomas Moschny]

commit f351d716975d4918d9f84a14c26e8e70733acae6
Merge: 215bd44 d8792c2
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Wed Jul 20 23:34:39 2011 +0200

    Merge branch 'master' into el6

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