[cups/f13/master: 78/80] Merge branch 'f12' into f13

[Tim Waugh]

commit cc71076475b9743d1846ebce7470535637419894
Merge: 405b603 c48334b
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Aug 3 13:25:13 2010 +0100

    Merge branch 'f12' into f13

 .gitignore                 |    2 ++
 cups-hostnamelookups.patch |   24 ++++++++++++++++++++++++
 cups.spec                  |    9 +++++++++
 3 files changed, 35 insertions(+), 0 deletions(-)
---
diff --cc cups.spec
index 4f2ec8f,3c45cee..ffc4bf1
--- a/cups.spec
+++ b/cups.spec
@@@ -567,11 -578,8 +571,16 @@@ rm -rf $RPM_BUILD_ROO
  %{php_extdir}/phpcups.so
  
  %changelog
+ * Tue Aug  3 2010 Tim Waugh <twaugh at redhat.com>
 -- Build requires gnutls-devel not openssl-devel.
++- Merged F-12 change:
++  - Use numeric addresses for interfaces unless HostNameLookups are
++    turned on (bug #583054).
++
 +* Tue Jul 13 2010 Jiri Popelka <jpopelka at redhat.com> 1:1.4.4-7
 +- Added restartlog to initscript usage output (bug #612996).
 +
 +* Mon Jul 12 2010 Jiri Popelka <jpopelka at redhat.com> 1:1.4.4-6
 +- Moved LICENSE.txt to libs sub-package.
  
  * Mon Jun 28 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-5
  - Avoid empty notify-subscribed-event attributes (bug #606909,