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

[james ni]

commit d8b9d891b9465a7deb06a56e754fa0800f953f8b
Merge: fe27c69 17d9846
Author: James Ni <kent.neo at gmail.com>
Date:   Tue Aug 23 18:08:28 2011 +0800

    Merge branch 'master' into el5

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