[cups/f14/master: 113/113] Merge branch 'f13' into f14

[Tim Waugh]

commit aed4fb1dba029f3868beb00993c5f70cf43cb6ca
Merge: 6ebae00 5619b50
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Aug 3 15:35:40 2010 +0100

    Merge branch 'f13' into f14

 .gitignore                 |    2 ++
 cups-hostnamelookups.patch |   24 ++++++++++++++++++++++++
 cups.spec                  |    9 +++++++++
 3 files changed, 35 insertions(+), 0 deletions(-)
---