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

[Tim Waugh]

commit 6f4a0ed63e2bd23c129078eec12b4e58a26605b5
Merge: 2f04b2a e42bf63
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Oct 5 17:20:04 2010 +0100

    Merge branch 'f13' into f14

 foomatic.spec |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)
---