[foomatic/f15] (2 commits) ...Merge branch 'f14' into f15

[Tim Waugh]

Summary of changes:

  230343e... Another fix for CVE-2011-2924 (bug #726426). (*)
  08b3258... Merge branch 'f14' into f15

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