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

[Jiří Popelka]

commit df54ddc6c11cfba0afadd5adfe033421f6071cb3
Merge: 8a41534 6e2a17f
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Dec 6 15:05:58 2010 +0100

    Merge branch 'f13' into f14

 foomatic-db-device-ids-20101202.patch |  244 +++++++++++++++++++++++++++++++++
 foomatic-db.spec                      |   17 ++-
 2 files changed, 260 insertions(+), 1 deletions(-)
---