commit 846a6c5a44462e4ce574c8e656d62fc26fe2d4f6 Merge: 9ff3d6e 112705b Author: Paul Howarth <paul@xxxxxxxxxxxx> Date: Mon Aug 23 10:44:49 2010 +0100 Merge remote branch 'origin/master' into el6/master Conflicts: .gitignore .gitignore | 2 +- 1 files changed, 1 insertions(+), 1 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