[openslide/el6: 3/3] Merge branch 'master' into el6

[Adam Goode]

commit ded24c05eb70c346d9b6ae474ba71b0bb3ce3c6d
Merge: 121d5ad 7c04e54
Author: Adam Goode <adam at spicenitz.org>
Date:   Sat Oct 6 19:31:26 2012 -0400

    Merge branch 'master' into el6

 .gitignore     |    2 +-
 openslide.spec |   18 +++++++++++++++++-
 sources        |    2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)
---