[perl-Devel-REPL/f13/master: 7/7] Merge remote branch 'origin/f14/master' into f13

[Iain Arnell]

commit 1f2ffadc0d3d2750fbc8991ececef5afd3907faa
Merge: a7fdd67 78ab8b5
Author: Iain Arnell <iarnell at epo.org>
Date:   Sat Oct 16 15:11:17 2010 +0200

    Merge remote branch 'origin/f14/master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore           |    2 +-
 perl-Devel-REPL.spec |   36 +++++++++++++++++++++++++++++-------
 sources              |    2 +-
 3 files changed, 31 insertions(+), 9 deletions(-)
---