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

[Ding-Yi Chen]

commit cc3b43813d8c1d27ea708d1f0379171cd226dd01
Merge: b0f5887 2af1362
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Nov 1 15:36:33 2011 +1000

    Merge branch 'master' into el5

 polib-0.7.0_dbafdc621bf4.patch |  261 ++++++++++++++++++++++++++++++++++++++++
 python-polib.spec              |   12 ++-
 2 files changed, 272 insertions(+), 1 deletions(-)
---