commit be89e78016944e8e37c369b26df546d10d27393d Merge: 9c46c84 3377ab9 Author: Jiri Popelka <jpopelka at redhat.com> Date: Wed Nov 16 16:02:18 2011 +0100 Merge branch 'f14' into f15 hplip-top-margins-not-respected.patch | 22 ++++++++++++++++++++++ hplip.spec | 9 ++++++++- 2 files changed, 30 insertions(+), 1 deletions(-) ---