[foomatic/f19: 2/2] Merge branch 'master' into f19

[Tim Waugh]

commit 1c4579ab6611ce1cc19ae83dd29d368f17e5db2c
Merge: 6f6f875 546ad1d
Author: Tim Waugh <twaugh at redhat.com>
Date:   Mon Jun 3 16:54:34 2013 +0100

    Merge branch 'master' into f19

 foomatic.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---