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

[Tim Waugh]

commit 08b32581e39c2cdf6ff41c43b64609e4b9dbd6f1
Merge: 00cb2eb 230343e
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Aug 18 16:38:18 2011 +0100

    Merge branch 'f14' into f15

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