[perl-Test-TCP/f16: 4/4] Merge remote-tracking branch 'origin/f17' into f16

[corsepiu]

commit 425e0b38d9e1bff39f123493ad0e7a79f25835b4
Merge: 2068f3f 160b1c1
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Tue Jul 10 06:33:31 2012 +0200

    Merge remote-tracking branch 'origin/f17' into f16

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