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

[Thomas Moschny]

commit 61fe93132c8ea08dbdf1b146ebe97eccb5630396
Merge: 3b384ea 8ed4744
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sun Sep 5 09:46:48 2010 +0200

    Merge branch 'master' into f13

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