[gutenprint: 3/3] Merge branch 'f13' into f14

[Jiří Popelka]

commit da61eefb28c830ce2489643bda5d3031af026a3a
Merge: d42810d 4fe887e
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Aug 11 17:02:49 2010 +0200

    Merge branch 'f13' into f14

 .gitignore                        |    1 +
 gutenprint-brother-hl-2040.patch  |   24 +++++-----
 gutenprint-device-ids.patch       |   96 ++++++++++++++++++------------------
 gutenprint-postscriptdriver.patch |   36 +++++++-------
 gutenprint.spec                   |    9 ++-
 sources                           |    2 +-
 6 files changed, 86 insertions(+), 82 deletions(-)
---