[python-progressbar/f18: 4/4] Merge branch 'master' into f18

[Christof Damian]

commit 0e7596b2b82b88996ba0b33912cf63716b31855d
Merge: 94c5c36 8709a62
Author: Christof Damian <christof at damian.net>
Date:   Sat May 25 17:26:26 2013 +0200

    Merge branch 'master' into f18

 .gitignore                  |    1 +
 progressbar-interrupt.patch |   12 ++++++++++++
 python-progressbar.spec     |   31 +++++++++++++++++++++----------
 sources                     |    2 +-
 4 files changed, 35 insertions(+), 11 deletions(-)
---