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

[Tim Waugh]

commit d136a19f70dfbd7d9795bfae0cd26b3f8ee2b893
Merge: 73694db 4080de8
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Dec 21 16:18:12 2010 +0000

    Merge branch 'f13' into f14

 foomatic.spec |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)
---