[cups: 3/3] Merge branch 'f13' into f14

[Tim Waugh]

commit 5979326f1f0beddce74ca5a4b8add97bae946393
Merge: aed4fb1 482fd1a
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Aug 13 11:29:36 2010 +0100

    Merge branch 'f13' into f14

 cups.init |   12 +++++++-----
 cups.spec |    5 ++++-
 2 files changed, 11 insertions(+), 6 deletions(-)
---