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

[Thomas Moschny]

commit ca1ac6fb3418dca56c467b734d524b0b9b222270
Merge: 61fe931 b34d8ff
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sat Nov 6 15:00:45 2010 +0100

    Merge branch 'master' into f13

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