[python-xlrd/f13/master: 4/4] Merge branch 'master' into f13

[Ján ONDREJ]

commit 81e7828d66cc94bdbb498cda0786f50ce1edce28
Merge: beb88ba 4aedfbf
Author: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
Date:   Mon Aug 23 21:16:55 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

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