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

[Tim Waugh]

commit a5b1da666e66a8ccec8c300b3abef242c01a940f
Merge: e700e50 a851317
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Oct 11 12:49:03 2011 +0100

    Merge branch 'f14' into f15

 gutenprint-device-ids.patch |   13 +++++++++++--
 gutenprint.spec             |    6 +++++-
 2 files changed, 16 insertions(+), 3 deletions(-)
---
diff --cc gutenprint.spec
index 39b932f,f523a28..9cd7900
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@@ -304,7 -305,10 +305,10 @@@ f
  /bin/rm -f /var/cache/foomatic/*
  
  %changelog
+ * Tue Oct 11 2011 Tim Waugh <twaugh at redhat.com> 5.2.7-7
+ - Added IEEE 1284 Device ID for Canon PIXMA MP250 (bug #744087).
+ 
 -* Tue Sep 27 2011 Jiri Popelka <jpopelka at redhat.com> 5.2.7-5
 +* Tue Sep 27 2011 Jiri Popelka <jpopelka at redhat.com> 5.2.7-6
  - Use _cups_serverbin macro from cups-devel for where to put driver executables.
  - Added IEEE 1284 Device ID for:
      Epson Stylus Photo R2400 (bug #720270)