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

[corsepiu]

commit b4d164b5b9acc5bfb9a1a5bf108095d6c9aeceaf
Merge: 2f5b9d4 7c795b7
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Wed Jun 8 08:25:05 2011 +0200

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

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