[libzdb: 10/12] Merge remote branch 'origin/el5/master'

[Bernard Johnson]

commit f65e031103cebc8ec948c533e91b4a077f4f10e8
Merge: 6fe077b 1fecb1d
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Sat Jan 15 09:40:06 2011 -0700

    Merge remote branch 'origin/el5/master'
    
    Conflicts:
    	libzdb.spec

---