[perl-File-Comments/el6/master: 7/7] Merge remote branch 'origin/master' into el6/master

[Paul Howarth]

commit 6a750f064fa5467ec6c895611e8b964915149fd0
Merge: 177073d 7af1e40
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Dec 10 09:18:50 2010 +0000

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

 .gitignore              |    2 +-
 perl-File-Comments.spec |   21 ++++++++++++++++++---
 sources                 |    2 +-
 3 files changed, 20 insertions(+), 5 deletions(-)
---