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

[Thomas Moschny]

commit 5f950eebb55c706c73e75e6005c7c52771434ee6
Merge: 91b7d0d 64a9a24
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sun Aug 29 12:23:26 2010 +0200

    Merge branch 'master' into el6

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