[epson-inkjet-printer-escpr/f16: 3/3] Merge branch 'master' into f16

[Jussi Lehtola]

commit b396788daaee7bf874c04c27e9861d55eea3737d
Merge: 4eada54 c49196e
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Wed Oct 31 13:17:15 2012 +0200

    Merge branch 'master' into f16

 .gitignore                      |    1 +
 epson-inkjet-printer-escpr.spec |   14 ++++++++------
 sources                         |    2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)
---