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

[Thomas Moschny]

commit 29d3b692dc7490bae8fd636b362b67df0630a0f8
Merge: 13424d7 8ed4744
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sun Sep 5 09:48:09 2010 +0200

    Merge branch 'master' into f12

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