[hplip] (6 commits) ...Merge branch 'f13' into f14

[Jiří Popelka]

Summary of changes:

  82aad95... IEEE1284 Device ID for HP LaserJet 4000 (bug #633227). (*)
  7d0656f... Fixes from package review. (*)
  1e701bb... Merge branch 'f12' into f13 (*)
  e5339ee... Use python_sitearch macro. (*)
  9600251... Increased curl/wget/ping timeouts (bug #635388).
  63b2d70... Merge branch 'f13' into f14

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