commit 9bd0730a7ec24b8e8228ab3e39024b75e289d4da Merge: 6b9fc43 da4557e Author: Tim Waugh <twaugh at redhat.com> Date: Fri Dec 9 12:15:38 2011 +0000 Merge branch 'f14' into f15 cups-lspp.patch | 25 ------------------------- cups-serverbin-compat.patch | 6 +++--- cups.spec | 5 ++++- 3 files changed, 7 insertions(+), 29 deletions(-) ---