[flies-python-client/f14/master: 5/5] Merge branch 'master' into f14

[james ni]

commit f0ca49051823bb9b89ce416a6f8a83d4ddc99db7
Merge: 691c1ba 689291c
Author: James Ni <kent.neo at gmail.com>
Date:   Thu Oct 21 12:26:40 2010 +0800

    Merge branch 'master' into f14

 .gitignore               |    1 +
 flies-python-client.spec |   10 ++++++++--
 sources                  |    2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)
---