[cups/f14/master: 9/9] Merge branch 'f13' into f14

[Tim Waugh]

commit aeaeffe7a6f825c68c5eb859292e63f5ec5a8093
Merge: 1132f4e bdfb23b
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Sep 17 17:07:42 2010 +0100

    Merge branch 'f13' into f14

 cups-force-gnutls.patch     |   89 +++++++++++++++++++++++++++++++++++
 cups-serialize-gnutls.patch |  109 +++++++++++++++++++++++++++++++++++++++++++
 cups-serverbin-compat.patch |   54 +++++++++++----------
 cups-snmp-quirks.patch      |    4 +-
 cups.spec                   |   24 +++++++++-
 5 files changed, 250 insertions(+), 30 deletions(-)
---