[cups/f15: 2/2] Merge branch 'f14' into f15

[Tim Waugh]

commit 7eda9daf3b7c42189b7c05bb194974f30ca982dc
Merge: b390ea2 aefd947
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Sep 14 12:06:21 2011 +0100

    Merge branch 'f14' into f15

 cups-cups-get-classes.patch |   18 +++++++++---------
 cups.spec                   |    5 ++++-
 2 files changed, 13 insertions(+), 10 deletions(-)
---