[openslide/el5/master: 44/44] Merge branch 'master' into el5

[Adam Goode]

commit 8b678745011e7c1ffd48767f7e0a63186591b2e8
Merge: 749ef91 14fe8e5
Author: Adam Goode <adam at spicenitz.org>
Date:   Mon Aug 2 09:27:40 2010 -0400

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	openslide.spec
    	sources

 openslide.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---