[genders/el6] (2 commits) ...here's a better patch from upstream

[David Brown]

Summary of changes:

  1792d25... here's a different patch from upstream (*)
  4b01502... here's a better patch from upstream (*)

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