[foomatic/f19: 5/5] Merge branch 'master' into f19

[Jiří Popelka]

commit 9d9af17f9e89d10845d656b7aab21e91181ad009
Merge: 1c4579a f35c944
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Nov 28 09:27:11 2013 +0100

    Merge branch 'master' into f19

 foomatic.spec |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)
---