[pycryptopp/f13/master: 7/7] Merge branch 'master' into f13 Merge in 0.5.25 update that upstream requested Conflicts: .gitignore

[Toshio くらとみ]

commit 3a012ba6339d5f6dafb33e073b38a20fb2d148eb
Merge: 315d484 7a19155
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Sep 23 17:28:38 2010 -0400

    Merge branch 'master' into f13
    Merge in 0.5.25 update that upstream requested
    Conflicts:
    	.gitignore

 pycryptopp-do_not_regenerate_darcs_stuff.patch |   49 --------------------
 pycryptopp-unbundle.patch                      |   58 ++++++++++++++++++++++++
 pycryptopp.spec                                |   40 +++++++++++-----
 sources                                        |    2 +-
 4 files changed, 86 insertions(+), 63 deletions(-)
---