[dlm: 3/3] Merge branch 'f17'

[David Teigland]

commit d666a2660ab5ac81071ff8ef1bd8556ae1a0bf41
Merge: bbf2556 18afd52
Author: David Teigland <teigland at redhat.com>
Date:   Thu Jun 21 17:12:38 2012 -0500

    Merge branch 'f17'
    
    Conflicts:
    	dlm.spec

 .gitignore |    1 +
 dlm.spec   |   10 ++++++++--
 sources    |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---