[perl-File-Next/el6: 16/16] Merge branch 'master' into el6

[李瑞彬]

commit fe5965cb2431724235b4b626e01530aa452a4b99
Merge: ffc7d9c 4902d08
Author: Robin Lee <cheeselee at fedoraproject.org>
Date:   Mon Apr 29 16:57:42 2013 +0800

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore          |    5 ++++-
 perl-File-Next.spec |   49 ++++++++++++++++++++++++++++++++++++++++++++-----
 sources             |    2 +-
 3 files changed, 49 insertions(+), 7 deletions(-)
---