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

[Tim Waugh]

commit 7a8d20f6e0495c9b96417f8be4b683919a762cf7
Merge: 6f4a0ed bf5532c
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Oct 15 18:01:41 2010 +0100

    Merge branch 'f13' into f14

 foomatic.spec |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)
---