[hplip: 6/6] Merge branch 'f14'

[Tim Waugh]

commit 777b8611f5b8795d0147fd53718e91c166164636
Merge: 0b50be3 2577b91
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Sep 30 10:16:50 2010 +0100

    Merge branch 'f14'

 hplip.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --cc hplip.spec
index 1784576,ffaecea..f4be61f
--- a/hplip.spec
+++ b/hplip.spec
@@@ -456,7 -456,12 +456,12 @@@ f
  %postun libs -p /sbin/ldconfig
  
  %changelog
+ * 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
 +* Wed Sep 29 2010 jkeating - 3.10.6-6
  - Rebuilt for gcc bug 634757
  
  * Mon Sep 20 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.6-5