[fence-agents/f19: 3/3] Merge branch 'master' into f19

[Marek Grác]

commit aa7dff8bd85e25d6496214ac1e248c10730d06ce
Merge: 3147802 354951a
Author: Marek 'marx' Grac <mgrac at redhat.com>
Date:   Thu Mar 21 23:59:11 2013 +0100

    Merge branch 'master' into f19
    
    Conflicts:
    	fence-agents.spec

 fence-agents.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---