[xorg-x11-drv-omap/f18] (4 commits) ...fix merge

[Peter Robinson]

Summary of changes:

  7bfd433... fix white space (*)
  6b734cc... ABI rebuild (*)
  f6b500f... 0.4.3 (*)
  59a9049... fix merge (*)

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