Merge changes from CUPS 1.5b1-r9774.


git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3247 a1ca3aef-8c08-0410-bb20-df032aa958be
176 files changed