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

[Tim Waugh]

Summary of changes:

  f607a37... Avoided another macro in comment. (*)
  d5c872f... Merge branch 'f12' into f13 (*)
  610a682... Use python_sitearch macro throughout. (*)
  023cb27... - Rebuilt for gcc bug 634757 (*)
  2577b91... Merge branch 'f13' into f14 (*)
  777b861... Merge branch 'f14'

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