[hplip/f14/master: 4/4] Merge branch 'f13' into f14

[Tim Waugh]

commit 2577b916bd36d7fb5677bf6bb2b3ec1b04f49667
Merge: 023cb27 610a682
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Sep 30 10:15:11 2010 +0100

    Merge branch 'f13' into f14

 hplip.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --cc hplip.spec
index 2b384ab,65c3c9d..ffaecea
--- a/hplip.spec
+++ b/hplip.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: HP Linux Imaging and Printing Project
  Name: hplip
  Version: 3.10.6
- Release: 5%{?dist}.1
 -Release: 5%{?dist}
++Release: 7%{?dist}
  License: GPLv2+ and MIT
  Group: System Environment/Daemons
  Conflicts: system-config-printer < 0.6.132
@@@ -456,9 -460,11 +456,14 @@@ f
  %postun libs -p /sbin/ldconfig
  
  %changelog
 -* Wed Sep 22 2010 Tim Waugh <twaugh at redhat.com>
++* Thu Sep 30 2010 Tim Waugh <twaugh at redhat.com> - 3.10.6-7
+ - More fixes from package review:
+   - Avoided another macro in comment.
+   - Use python_sitearch macro throughout.
+ 
 +* Wed Sep 29 2010 jkeating - 3.10.6-5.1
 +- Rebuilt for gcc bug 634757
 +
  * Mon Sep 20 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.6-5
  - Increased timeouts for curl, wget, ping for high latency networks (bug #635388).