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

[Marek Grác]

commit 9cdc448ac4fc5005320196289a10826510e4d1d2
Merge: cd464e1 517cbd1
Author: Marek 'marx' Grac <mgrac at redhat.com>
Date:   Thu Mar 29 14:01:21 2012 +0200

    Merge branch 'master' into f16

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