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

[Jiří Popelka]

commit b458cbb3aebf598c6745a0ef12f5ee677b7c5008
Merge: 40ad4a8 3571147
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Fri Aug 20 19:33:07 2010 +0200

    Merge branch 'f13' into f14

 foomatic-db-device-ids-20100506.patch |   63 +++------------------------------
 foomatic-db.spec                      |   11 ++++--
 2 files changed, 13 insertions(+), 61 deletions(-)
---