[make/f18] (3 commits) ...Actually add the patch from previous commit

[Petr Machata]

Summary of changes:

  19e83e3... Add one patch comment, fix another (*)
  3c30cb1... Add fix for upstream bug 30653, RH#835424 (*)
  a6daa69... Actually add the patch from previous commit (*)

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