[cups/f16] (3 commits) ...Merge branch 'f15' into f16

[Tim Waugh]

Summary of changes:

  cf15da7... Avoid GIF reader loop (CVE-2011-2896, STR #3914, bug #72780 (*)
  4b8b8d3... Merge branch 'f14' into f15 (*)
  39d5c4b... Merge branch 'f15' into f16

(*) This commit already existed in another branch; no separate mail sent