[cups: 3/3] Merge branch 'f14'

[Jiří Popelka]

commit 5ab983ce1d8ecf753fe6f1be099f2f4fa042b92f
Merge: 6f33db0 a9cf40c
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Fri Jan 7 11:08:15 2011 +0100

    Merge branch 'f14'

 .gitignore            |    1 +
 cups-page-label.patch |   10 +++++-----
 cups.spec             |    7 +++++--
 sources               |    2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)
---
diff --cc cups.spec
index 1757cf0,c15c89a..52d3870
--- a/cups.spec
+++ b/cups.spec
@@@ -599,13 -576,10 +599,16 @@@ rm -rf $RPM_BUILD_ROO
  %{php_extdir}/phpcups.so
  
  %changelog
+ * Fri Jan 07 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.6-1
+ - 1.4.6.
+ 
 -* Wed Dec 22 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.5-4
 +* Fri Dec 31 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.5-10
 +- Some Avahi support fixes from Till Kamppeter.
 +
 +* Fri Dec 24 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.5-9
 +- Native Avahi support for announcing printers on the network.
 +
 +* Wed Dec 22 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.5-8
  - Don't crash when job queued for browsed printer that times out
    (bug #660604).