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

[corsepiu]

commit 3bf6ef6ace704aa06bb16be653cfa987f2526e75
Merge: 29721ee 222729b
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Fri Apr 29 14:31:49 2011 +0200

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

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