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

[Thomas Moschny]

commit 13424d732dacb49dd94d1c32353b9b268bba7e4e
Merge: b0b578d 64a9a24
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sun Aug 29 12:22:49 2010 +0200

    Merge branch 'master' into f12

 README.fedora |    1 +
 botan.spec    |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletions(-)
---