[zanata-python-client/el5: 3/3] Merge branch 'master' into el5

[james ni]

commit 0623f655bbe0566082e2799b5d6139dc52f3ab1d
Merge: aaeddb2 c0af839
Author: James Ni <kent.neo at gmail.com>
Date:   Thu Dec 1 16:07:30 2011 +0800

    Merge branch 'master' into el5

 .gitignore                |    1 +
 sources                   |    2 +-
 zanata-python-client.spec |    8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)
---