Merge fixes from CUPS 1.4svn-r7555.


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