[foomatic-db/f14/master: 16/16] Merge branch 'f13' into f14

[Jiří Popelka]

commit 40ad4a81011c1704e8cbf41759712038f5176196
Merge: 724088b 5fec398
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Aug 19 13:37:00 2010 +0200

    Merge branch 'f13' into f14

 .gitignore                                         |    2 +
 foomatic-db-bad-margins.patch                      | 3656 --
 foomatic-db-device-id-C3170.patch                  |   16 +
 ...tic-db-device-id-hp-ps2570-dj959c-ojpk550.patch |   47 -
 foomatic-db-device-id-kyocera-mita-fs-1020d.patch  |   90 -
 foomatic-db-device-ids-20100416.patch              |   51 -
 foomatic-db-device-ids-20100506.patch              |   72 -
 foomatic-db-device-ids-ricoh.patch                 |40198 --------------------
 foomatic-db.spec                                   |   45 +-
 sources                                            |    4 +-
 10 files changed, 35 insertions(+), 44146 deletions(-)
---