commit 9c46c84e137d14252bd8df590d1870e417e1b706 Merge: d24c4bb 57c6df2 Author: Tim Waugh <twaugh at redhat.com> Date: Tue Oct 25 16:10:48 2011 +0100 Merge branch 'f14' into f15 hplip-systray-dbus-exception.patch | 18 ++++++++++++++++++ hplip.spec | 9 ++++++++- 2 files changed, 26 insertions(+), 1 deletions(-) ---