[python-xlrd/f12/master: 5/5] Merge branch 'master' into f12

[Ján ONDREJ]

commit c39f9315cf1e474c7de3046cd265bb3a9cf2f34d
Merge: 1b87bc7 4aedfbf
Author: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
Date:   Mon Aug 23 21:23:34 2010 +0200

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    
    New version.

 .gitignore       |    1 -
 python-xlrd.spec |   20 +++++++++++++-------
 sources          |    2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)
---