[libldb/f19: 3/3] Merge branch 'master' into f19

[Stephen Gallagher]

commit f5a30e5e904c12a1ade395dd0469e963ce01b232
Merge: 503030b 6a1d425
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Jul 2 11:32:58 2013 -0400

    Merge branch 'master' into f19
    
    Conflicts:
    	libldb.spec

 .gitignore  |    1 +
 libldb.spec |    9 ++++++---
 sources     |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---