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

[Thomas Moschny]

commit 3b384ea96a04f753c7574bddf9cfd5dfc151b3ee
Merge: 6d41d56 64a9a24
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sun Aug 29 12:22:07 2010 +0200

    Merge branch 'master' into f13

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