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

[Tim Waugh]

commit ac9a4ac002292124d17b60a3187dedfe29b84c86
Merge: d42a6fe 4816e65
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Jan 18 12:48:29 2011 +0000

    Merge branch 'f13' into f14

 cups.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---