Merge changes from CUPS 1.4svn-r8731 (1.4.0)


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