[python-polib/el6: 4/4] Merge branch 'master' into el6

[Ding-Yi Chen]

commit aff24aae9f45226365e1e55de2e1bc10d060dd8b
Merge: 9ec5714 784039b
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Mon Jul 30 23:56:46 2012 +1000

    Merge branch 'master' into el6

 .gitignore        |    1 +
 python-polib.spec |   17 +++++++++++++----
 sources           |    2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)
---