[hplip: 2/4] Merge branch 'f16' into f17

[Jiří Popelka]

commit 23778a375e4063790cf7929e8afa4b3ee4000ca8
Merge: d3f405f 2a93e05
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Sep 27 17:21:36 2012 +0200

    Merge branch 'f16' into f17

 hplip-cron-locale.patch |   12 ++++++++++++
 hplip.spec              |   25 +++++++++++--------------
 2 files changed, 23 insertions(+), 14 deletions(-)
---