[fence-agents/f16: 3/3] Merge branch 'f17' into f16

[Marek Grác]

commit 0d6fbc0e0df8d540315c973c2259aadd40275b35
Merge: 9cdc448 49a24d8
Author: Marek 'marx' Grac <mgrac at redhat.com>
Date:   Mon Jul 30 08:23:29 2012 +0200

    Merge branch 'f17' into f16

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