[foomatic-db: 2/2] Merge branch 'f17' into f18

[Jiří Popelka]

commit 0c3a9c0e7830690395162a6205648d96d26ea15a
Merge: 7285383 60084b6
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Oct 11 11:49:10 2012 +0200

    Merge branch 'f17' into f18

 .gitignore       |    1 +
 foomatic-db.spec |    7 +++++--
 sources          |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc foomatic-db.spec
index 52075cc,1460f58..474af5c
--- a/foomatic-db.spec
+++ b/foomatic-db.spec
@@@ -151,12 -151,12 +151,15 @@@ ln -sf ../../foomatic/db/source/PPD %{b
  %{_datadir}/cups/model/foomatic-db-ppds
  
  %changelog
+ * Thu Oct 11 2012 Jiri Popelka <jpopelka at redhat.com> 4.0-34.20120719
+ - Updated to foomatic-db-4.0-20121011
+ 
 -* Thu Jul 19 2012 Jiri Popelka <jpopelka at redhat.com> 4.0-32.20120719
 +* Thu Jul 19 2012 Jiri Popelka <jpopelka at redhat.com> 4.0-33.20120719
  - Updated to foomatic-db-4.0-20120719
  
 +* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-32.20120103
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 +
  * Fri Feb 24 2012 Tim Waugh <twaugh at redhat.com> 4.0-31.20120103
  - Device IDs for:
    - HP DeskJet 720C (bug #797099)