[perl-File-Slurp/f13: 2/2] Merge remote-tracking branch 'origin/master' into f13

[corsepiu]

commit 8a2786abadafd99d09e3f0541c7f7376664386f6
Merge: 751485d b6300f1
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Mon May 16 06:58:55 2011 +0200

    Merge remote-tracking branch 'origin/master' into f13

 .gitignore           |    1 +
 perl-File-Slurp.spec |    5 ++++-
 sources              |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---