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

[Ding-Yi Chen]

commit 65e90862405d65d3103865ea8a8a4f34d4cab95a
Merge: 6ecb183 561737c
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Fri Oct 28 17:21:50 2011 +1000

    Merge branch 'master' into el5
    
    Conflicts:
    	.cvsignore
    	Makefile
    	python-polib.spec
    	sources

 .cvsignore        |    1 -
 .gitignore        |    2 +
 Makefile          |   21 --------------
 python-polib.spec |   81 ++++++++++++++++++++++++++++++++++++++++++++++++----
 sources           |    2 +-
 5 files changed, 77 insertions(+), 30 deletions(-)
---