[xinetd/f17: 8/8] Merge branch 'master' into f17, so they have the same history

[jsynacek]

commit 82eddd5b4d16916bc58e8f7d25c85008492a5615
Merge: 5ae7170 8be953d
Author: Jan Synacek <jsynacek at redhat.com>
Date:   Mon Apr 16 10:04:48 2012 +0200

    Merge branch 'master' into f17, so they have the same history

 xinetd-2.3.14-leaking-fds-2a.patch                 |   41 +++++++++++++++
 ...-2.3.14-retry-svc-activate-in-cps-restart.patch |   54 ++++++++++++++++++++
 xinetd.service                                     |    2 +-
 xinetd.spec                                        |   18 ++++++-
 4 files changed, 111 insertions(+), 4 deletions(-)
---