[gd/f17] (3 commits) ...conflict resoved

[Jan Horak]

Summary of changes:

  b8518cb... - Rebuilt for glibc bug#747377 (*)
  c41d610... Fixed AALineThick.patch to display vertical lines correctly (*)
  d750b13... conflict resoved (*)

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