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

[james ni]

commit a39d8e32e5bd16bd0aaf992128a4862631b2a271
Merge: 2f853c3 37f1f9d
Author: James Ni <kent.neo at gmail.com>
Date:   Thu Oct 21 15:47:14 2010 +0800

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore

 .gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---