[hplip/f13/master: 2/3] Merge branch 'f12' into f13

[Tim Waugh]

commit d5c872fead0e0408aacb4166db9c1cf7a71eceae
Merge: 9600251 f607a37
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Sep 22 10:29:25 2010 +0100

    Merge branch 'f12' into f13

 hplip.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --cc hplip.spec
index 467fc11,81118df..68d05d4
--- a/hplip.spec
+++ b/hplip.spec
@@@ -460,9 -420,10 +460,13 @@@ f
  %postun libs -p /sbin/ldconfig
  
  %changelog
+ * Wed Sep 22 2010 Tim Waugh <twaugh at redhat.com>
+ - More fixes from package review:
+   - Avoided another macro in comment.
+ 
 +* 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).
 +
  * Wed Sep 15 2010 Tim Waugh <twaugh at redhat.com>
  - Fixes from package review:
    - Main package and hpijs sub-package require cups for directories.