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

[Ding-Yi Chen]

commit 9ec5714e8489b836b46632a862ac7b6c3aab0795
Merge: e9f3c15 2af1362
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Nov 1 15:30:49 2011 +1000

    Merge branch 'master' into el6

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