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

[Tim Waugh]

commit b390ea20d1295932dda0c66831478ff9dda6b61a
Merge: 4b8b8d3 f6b6480
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Aug 19 15:18:59 2011 +0100

    Merge branch 'f14' into f15

 cups.spec |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---