[gutenprint: 7/7] Merge branch 'f17'

[Jiří Popelka]

commit f09e6285ed8462ff69af0648e13ddd8fe3ddcc25
Merge: 9ac9353 c7e4844
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Jul 9 15:14:42 2012 +0200

    Merge branch 'f17'

 .gitignore      |    1 +
 gutenprint.spec |    7 +++++--
 sources         |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc gutenprint.spec
index 0be1194,bc4aee4..8818f22
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@@ -292,8 -292,11 +292,11 @@@ f
  /bin/rm -f /var/cache/foomatic/*
  
  %changelog
+ * Mon Jul 09 2012 Jiri Popelka <jpopelka at redhat.com> 5.2.9-1
+ - 5.2.9
+ 
  * Tue Jun 12 2012 Jiri Popelka <jpopelka at redhat.com> 5.2.8-2
 -- Avoid the libgutenprint soname bump so we can update gutenprint in F16 & 17.
 +- bumped release
  
  * Tue Jun 12 2012 Jiri Popelka <jpopelka at redhat.com> 5.2.8-1
  - 5.2.8