[cryptopp/f13/master: 6/6] Merge branch 'master' into f13

[nucleo]

commit 755384850b9c6d87c85d4749b68c607f53fb6501
Merge: 3e43d91 d094d54
Author: nucleo <nucleo at fedoraproject.org>
Date:   Sun Jan 23 01:29:42 2011 +0200

    Merge branch 'master' into f13

 cryptopp-x86-disable-sse2.patch |   10 ++++++++++
 cryptopp.spec                   |   14 +++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)
---