commit 1132f4e383049e58d6f3334755134efcd834aad7 Merge: 5979326 7fe5158 Author: Tim Waugh <twaugh at redhat.com> Date: Fri Aug 20 12:06:30 2010 +0100 Merge branch 'f13' into f14 cups-str3608.patch | 49 +++++++++++++++++++++++++++++++++++-------------- cups.spec | 5 ++++- 2 files changed, 39 insertions(+), 15 deletions(-) ---