commit 03300893654ee48a76e151b8d6c651dd003177cf Merge: ce00c80 7e27893 Author: Lubomir Rintel <lkundrak@xxxxx> Date: Sun Dec 12 16:12:38 2010 +0100 Merge branch 'master' into el6 Conflicts: .gitignore .gitignore | 1 + KinoSearch-0.164-ppc.patch | 16 ---------------- perl-KinoSearch.spec | 13 +++++++++++-- sources | 2 +- 4 files changed, 13 insertions(+), 19 deletions(-) --- -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel