[openslide/f12/master: 30/30] Merge branches 'f12', 'f13', 'f14' and 'el6'

[Adam Goode]

commit 14fe8e5f38b53f8f92e66c6a9e6d31d8730be6df
Merge: 65349ad c956613 33fa31e 9222337
Author: Adam Goode <adam at spicenitz.org>
Date:   Mon Aug 2 09:24:57 2010 -0400

    Merge branches 'f12', 'f13', 'f14' and 'el6'

---