Merge changes from CUPS 1.4svn-r8196 (CUPS 1.4b2)


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