[foomatic/f15: 2/2] Merge branch 'f14' into f15

[Jiří Popelka]

commit a398c2c51673abff74af04efe9f9074c88dcd9d7
Merge: 08b3258 9372a75
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Oct 24 13:33:14 2011 +0200

    Merge branch 'f14' into f15

 foomatic-filters-debug-string.patch |   12 ++++++++++++
 foomatic.spec                       |   34 +++++++++++++++++++---------------
 2 files changed, 31 insertions(+), 15 deletions(-)
---