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

[corsepiu]

commit ce6fdac9a36cb866856479fabd752c528092a893
Merge: 160b1c1 a400525
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Tue Jul 31 05:47:34 2012 +0200

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

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