[perl-File-LibMagic/f13/master: 5/5] Merge remote branch 'origin/master' into f13

[Robert Scheck]

commit c08e650723e7ab53b4567e6e241e0861170a6c9c
Merge: db70c21 58e788c
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Dec 4 16:53:38 2010 +0100

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

 .gitignore              |    2 +-
 perl-File-LibMagic.spec |   20 +++++++++++++++-----
 sources                 |    2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)
---