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

[Ding-Yi Chen]

commit e07d3c20ac72147fc786b416f58159d41723c608
Merge: cc3b438 784039b
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Jul 31 00:04:51 2012 +1000

    Merge branch 'master' into el5

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