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

[Thomas Moschny]

commit 3b7fd882f5203d60633bf69f5e9ecd47cbe37043
Merge: 5f950ee 8ed4744
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sun Sep 5 09:40:25 2010 +0200

    Merge branch 'master' into el6

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