Merge changes from CUPS 1.4svn-r7582.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Fri, 16 May 2008 03:15:15 +0000 (03:15 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Fri, 16 May 2008 03:15:15 +0000 (03:15 +0000)
commit01ce6322ca3809ac0260c8ef28abbc8255f6e34f
treeb65c4278e38f0a6f1aac239f3654636d51d0889b
parent3c8c76971a30d42417c0152f83bf8786185442e4
Merge changes from CUPS 1.4svn-r7582.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@768 a1ca3aef-8c08-0410-bb20-df032aa958be
22 files changed:
CHANGES.txt
conf/cupsd.conf.in
config-scripts/cups-common.m4
cups/adminutil.c
cups/localize.c
cups/test.ppd
doc/help/ref-cupsd-conf.html.in
doc/help/ref-page_log.html
doc/help/spec-command.html
doc/help/spec-ipp.html
doc/help/spec-ppd.html
doc/help/whatsnew.html
man/Makefile
man/cupsd.conf.man.in
scheduler/client.c
scheduler/conf.c
scheduler/conf.h
scheduler/ipp.c
scheduler/job.c
scheduler/log.c
scheduler/printers.c
templates/help-header.tmpl