[hplip/f15] (2 commits) ...Merge branch 'f14' into f15

[Tim Waugh]

Summary of changes:

  57c6df2... Catch DBusException in hp-systray (bug #746024). (*)
  9c46c84... Merge branch 'f14' into f15

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