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

[Tim Waugh]

commit 00cb2eb4b0a3b2892881d795cf85d7a766118f77
Merge: 204a26b ffe3936
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Aug 18 14:36:48 2011 +0100

    Merge branch 'f14' into f15

 foomatic-filters-CVE-2011-2924.patch |   12 ++++++++++++
 foomatic.spec                        |   11 ++++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---