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

[Thomas Moschny]

commit da76b24b6a77772e41bcbc42bcb8fd8d65179fa4
Merge: 5d6ca9c 8ed4744
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Fri Sep 17 00:24:46 2010 +0200

    Merge branch 'master' into el5

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